From caf5d8789ddd6c7bb81e5db6a2e3d536ea8e959f Mon Sep 17 00:00:00 2001 From: Daniel Voogsgerd Date: Tue, 8 Oct 2024 12:05:06 +0200 Subject: [PATCH] fix: Generate override even without hosts This guard clause was a correct optimization before we set loglevels via overrides --- brane-ctl/src/lifetime.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/brane-ctl/src/lifetime.rs b/brane-ctl/src/lifetime.rs index cf7edcd8..278414e9 100644 --- a/brane-ctl/src/lifetime.rs +++ b/brane-ctl/src/lifetime.rs @@ -429,7 +429,7 @@ fn get_log_level(service: ServiceKind) -> Option { match std::env::var(&log_var) { Ok(val) => return Some(val), // TODO: Could use the trace! macro from error-trace. - Err(err) => tracing::info!( + Err(err) => tracing::trace!( "Malformed log level set using environment variable `{log_var}`. Falling back to using `BRANE_LOG`, if it is set. Cause: \n{err:#}" ), }; @@ -438,7 +438,7 @@ fn get_log_level(service: ServiceKind) -> Option { Ok(val) => return Some(val), // TODO: Could use the trace! macro from error-trace. Err(err) => { - tracing::info!("Malformed log level set using environment variable `BRANE_LOG`. Continuing with default logging. Cause: \n{err:#}") + tracing::trace!("Malformed log level set using environment variable `BRANE_LOG`. Continuing with default logging. Cause: \n{err:#}") }, }; @@ -458,11 +458,6 @@ fn get_log_level(service: ServiceKind) -> Option { /// # Errors /// This function errors if we failed to write the file. fn generate_override_file(node_config: &NodeConfig, hosts: &HashMap, profile_dir: Option) -> Result, Error> { - // Early quit if there's nothing to do - if hosts.is_empty() { - return Ok(None); - } - // Generate the ComposeOverrideFileService let svc: ComposeOverrideFileService = ComposeOverrideFileService { volumes: if let Some(dir) = profile_dir { vec![format!("{}:/logs/profile", dir.display())] } else { vec![] }, @@ -482,7 +477,9 @@ fn generate_override_file(node_config: &NodeConfig, hosts: &HashMap