Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust/server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ fn main() {
};

let rest_svc_listener = TcpListener::bind(&config.bind_address).await.unwrap_or_else(|e| {
error!("Failed to bind listening port: {}", e);
error!("Failed to bind to address {}: {}", config.bind_address, e);
std::process::exit(-1);
});
info!("Listening for incoming connections on {}{}", config.bind_address, crate::vss_service::BASE_PATH_PREFIX);
Expand Down
22 changes: 5 additions & 17 deletions rust/server/src/util/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ struct TomlConfig {

#[derive(Deserialize)]
struct ServerConfig {
bind_address: Option<SocketAddr>,
bind_address: Option<String>,
}

#[derive(Deserialize)]
Expand All @@ -39,7 +39,7 @@ struct JwtAuthConfig {
struct PostgreSQLConfig {
username: Option<String>,
password: Option<String>,
address: Option<SocketAddr>,
address: Option<String>,
default_database: Option<String>,
vss_database: Option<String>,
tls: Option<TlsConfig>,
Expand All @@ -58,7 +58,7 @@ struct LogConfig {

// Encapsulates the result of reading both the environment variables and the config file.
pub(crate) struct Configuration {
pub(crate) bind_address: SocketAddr,
pub(crate) bind_address: String,
pub(crate) rsa_pem: Option<String>,
pub(crate) postgresql_prefix: String,
pub(crate) default_db: String,
Expand Down Expand Up @@ -99,13 +99,7 @@ pub(crate) fn load_configuration(config_file_path: Option<&str>) -> Result<Confi
None => TomlConfig::default(), // All fields are set to `None`
};

let bind_address_env = read_env(BIND_ADDR_VAR)?
.map(|addr| {
addr.parse().map_err(|e| {
format!("Unable to parse the bind address environment variable: {}", e)
})
})
.transpose()?;
let bind_address_env = read_env(BIND_ADDR_VAR)?;
let bind_address = read_config(
bind_address_env,
server_config.and_then(|c| c.bind_address),
Expand Down Expand Up @@ -146,13 +140,7 @@ pub(crate) fn load_configuration(config_file_path: Option<&str>) -> Result<Confi

let username_env = read_env(PSQL_USER_VAR)?;
let password_env = read_env(PSQL_PASS_VAR)?;
let address_env: Option<SocketAddr> = read_env(PSQL_ADDR_VAR)?
.map(|address| {
address.parse().map_err(|e| {
format!("Unable to parse the postgresql address environment variable: {}", e)
})
})
.transpose()?;
let address_env: Option<String> = read_env(PSQL_ADDR_VAR)?;
let default_db_env = read_env(PSQL_DB_VAR)?;
let vss_db_env = read_env(PSQL_VSS_DB_VAR)?;
let tls_config_env = read_env(PSQL_TLS_VAR)?;
Expand Down