[pbs-devel] [PATCH proxmox-perl-rs 4/4] log: use new init function, print to stderr and journald

Gabriel Goller g.goller at proxmox.com
Mon Dec 9 10:43:29 CET 2024


Use the new init function. Print the logs to stderr and journald always.
Remove the log dependency.

Suggested-by: Lukas Wagner <l.wagner at proxmox.com>
Signed-off-by: Gabriel Goller <g.goller at proxmox.com>
---
 common/src/logger.rs | 4 +++-
 pmg-rs/Cargo.toml    | 1 -
 pmg-rs/src/lib.rs    | 2 +-
 pve-rs/Cargo.toml    | 1 -
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/src/logger.rs b/common/src/logger.rs
index 1c8940ba4588..5edb08a45f39 100644
--- a/common/src/logger.rs
+++ b/common/src/logger.rs
@@ -5,7 +5,9 @@ pub fn init(env_var_name: &str, default_log_level: &str) {
     if let Err(e) = default_log_level
         .parse()
         .map_err(Error::from)
-        .and_then(|default_log_level| proxmox_log::init_logger(env_var_name, default_log_level))
+        .and_then(|default_log_level| {
+            proxmox_log::init::stderr_and_journald_with_pve_format(env_var_name, default_log_level)
+        })
     {
         eprintln!("could not set up env_logger: {e:?}");
     }
diff --git a/pmg-rs/Cargo.toml b/pmg-rs/Cargo.toml
index 12526714f060..137434d227ac 100644
--- a/pmg-rs/Cargo.toml
+++ b/pmg-rs/Cargo.toml
@@ -18,7 +18,6 @@ anyhow = "1.0"
 hex = "0.4"
 http = "0.2.7"
 libc = "0.2"
-log = "0.4.17"
 nix = "0.26"
 openssl = "0.10.40"
 serde = "1.0"
diff --git a/pmg-rs/src/lib.rs b/pmg-rs/src/lib.rs
index 3db6966ab263..0ebe2855f8c4 100644
--- a/pmg-rs/src/lib.rs
+++ b/pmg-rs/src/lib.rs
@@ -29,7 +29,7 @@ mod export {
 }
 
 pub fn send_updates_available(_updates: &[&APTUpdateInfo]) -> Result<(), Error> {
-    log::warn!("update notifications are not implemented for PMG yet");
+    tracing::warn!("update notifications are not implemented for PMG yet");
 
     Ok(())
 }
diff --git a/pve-rs/Cargo.toml b/pve-rs/Cargo.toml
index 4b6dec6ff452..8eb7bbdf61eb 100644
--- a/pve-rs/Cargo.toml
+++ b/pve-rs/Cargo.toml
@@ -20,7 +20,6 @@ base64 = "0.13"
 hex = "0.4"
 http = "0.2.7"
 libc = "0.2"
-log = "0.4.17"
 nix = "0.26"
 openssl = "0.10.40"
 serde = "1.0"
-- 
2.39.5





More information about the pbs-devel mailing list