konevsa/proxmox
1
0
Fork 0
forked from Proxmox/proxmox
Code Pull Requests Activity

log: fallback to stderr if syslog not available

Browse Source 
Don't panic when the syslog is not available - which happens commonly in
containers and sbuild environments (chroot and unshare) - instead
fallback to stderr.

Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
Tested-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Gabriel Goller 2024-09-10 15:03:51 +02:00 committed by Wolfgang Bumiller
parent c6fd5604df
commit c9c9ade96e
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
proxmox-log/src/lib.rs
View File

@ -50,8 +50,7 @@ pub fn init_logger(
}
let registry = tracing_subscriber::registry()
.with(
tracing_journald::layer()
.expect("Unable to open syslog")
journald_or_stderr_layer()
.with_filter(filter_fn(|metadata| {
!LogContext::exists() || *metadata.level() >= Level::ERROR
}))
@ -127,6 +126,35 @@ impl LogContext {
}
}
fn journald_or_stderr_layer<S>() -> Box<dyn tracing_subscriber::Layer<S> + Send + Sync>
where
S: tracing::Subscriber,
S: for<'a> tracing_subscriber::registry::LookupSpan<'a>,
{
match tracing_journald::layer() {
Ok(layer) => layer.boxed(),
Err(err) => {
eprintln!("Unable to open syslog: {err:?}");
plain_stderr_layer().boxed()
}
}
}
fn plain_stderr_layer<S>() -> impl tracing_subscriber::Layer<S>
where
S: tracing::Subscriber,
S: for<'a> tracing_subscriber::registry::LookupSpan<'a>,
{
let format = tracing_subscriber::fmt::format()
.with_level(false)
.without_time()
.with_target(false)
.compact();
tracing_subscriber::fmt::layer()
.event_format(format)
.with_writer(std::io::stderr)
}
/// Initialize default logger for CLI binaries
pub fn init_cli_logger(
env_var_name: &str,
@ -144,17 +172,9 @@ pub fn init_cli_logger(
}
}
let format = tracing_subscriber::fmt::format()
.with_level(false)
.without_time()
.with_target(false)
.compact();
let registry = tracing_subscriber::registry()
.with(
tracing_subscriber::fmt::layer()
.event_format(format)
.with_writer(std::io::stderr)
plain_stderr_layer()
.with_filter(filter_fn(|metadata| {
!LogContext::exists() || *metadata.level() >= Level::ERROR
}))