based on the rest of the discussion, this will be rebased on top of the builder from
https://lore.proxmox.com/pve-devel/20250218161311.558674-2-g.gol...@proxmox.com/ ? On December 6, 2024 11:10 am, Lukas Wagner wrote: > The proxmox-notify crate now uses tracing for logging, > hence we have to switch to proxmox-log (which configures the appropriate > layers/subscribers for tracing). > > Signed-off-by: Lukas Wagner <l.wag...@proxmox.com> > --- > Cargo.toml | 5 ++--- > src/main.rs | 16 +++++++--------- > 2 files changed, 9 insertions(+), 12 deletions(-) > > diff --git a/Cargo.toml b/Cargo.toml > index 0f4e3b0..9dc081b 100644 > --- a/Cargo.toml > +++ b/Cargo.toml > @@ -15,9 +15,8 @@ exclude = [ "debian" ] > > [dependencies] > anyhow = "1.0" > -log = "0.4.17" > nix = "0.26" > -syslog = "6.0" > > -proxmox-sys = "0.6" > +proxmox-log = "0.2" > proxmox-notify = {version = "0.5", features = ["mail-forwarder", > "pve-context", "pbs-context"] } > +proxmox-sys = "0.6" > diff --git a/src/main.rs b/src/main.rs > index 4662ffa..c0ea561 100644 > --- a/src/main.rs > +++ b/src/main.rs > @@ -23,6 +23,8 @@ use std::path::Path; > > use anyhow::Error; > > +use proxmox_log::error; > +use proxmox_log::LevelFilter; > use proxmox_notify::context::pbs::PBS_CONTEXT; > use proxmox_notify::context::pve::PVE_CONTEXT; > use proxmox_notify::Config; > @@ -42,7 +44,7 @@ fn attempt_file_read<P: AsRef<Path>>(path: P) -> > Option<String> { > match fs::file_read_optional_string(path.as_ref()) { > Ok(contents) => contents, > Err(err) => { > - log::error!("unable to read {path:?}: {err}", path = > path.as_ref()); > + error!("unable to read {path:?}: {err}", path = path.as_ref()); > None > } > } > @@ -112,11 +114,7 @@ fn forward_for_pbs(mail: &[u8], has_pve: bool) -> > Result<(), Error> { > } > > fn main() { > - if let Err(err) = syslog::init( > - syslog::Facility::LOG_DAEMON, > - log::LevelFilter::Info, > - Some("proxmox-mail-forward"), > - ) { > + if let Err(err) = proxmox_log::init_logger("PROXMOX_LOG", > LevelFilter::INFO) { > eprintln!("unable to initialize syslog: {err}"); > } > > @@ -129,19 +127,19 @@ fn main() { > if Path::new(PVE_CFG_PATH).exists() { > has_pve = true; > if let Err(err) = forward_for_pve(&mail) { > - log::error!("could not forward mail for Proxmox VE: > {err}"); > + error!("could not forward mail for Proxmox VE: {err}"); > } > } > > // Assume a PBS installation if /etc/proxmox-backup exists > if Path::new(PBS_CFG_PATH).exists() { > if let Err(err) = forward_for_pbs(&mail, has_pve) { > - log::error!("could not forward mail for Proxmox Backup > Server: {err}"); > + error!("could not forward mail for Proxmox Backup > Server: {err}"); > } > } > } > Err(err) => { > - log::error!("could not read mail from STDIN: {err}") > + error!("could not read mail from STDIN: {err}") > } > } > } > -- > 2.39.5 > > > > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel > > > _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
