[pbs-devel] [PATCH proxmox-backup 08/10] proxmox-rest-server: replace print with log macro

Hannes Laimer h.laimer at proxmox.com
Fri Mar 11 16:07:53 CET 2022


Signed-off-by: Hannes Laimer <h.laimer at proxmox.com>
---
 proxmox-rest-server/src/api_config.rs     |  4 ++--
 proxmox-rest-server/src/command_socket.rs | 10 +++++-----
 proxmox-rest-server/src/file_logger.rs    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/proxmox-rest-server/src/api_config.rs b/proxmox-rest-server/src/api_config.rs
index ad76a15f..2a6e1a91 100644
--- a/proxmox-rest-server/src/api_config.rs
+++ b/proxmox-rest-server/src/api_config.rs
@@ -213,7 +213,7 @@ impl ApiConfig {
         self.request_log = Some(Arc::clone(&request_log));
 
         commando_sock.register_command("api-access-log-reopen".into(), move |_args| {
-            println!("re-opening access-log file");
+            log::info!("re-opening access-log file");
             request_log.lock().unwrap().reopen()?;
             Ok(serde_json::Value::Null)
         })?;
@@ -253,7 +253,7 @@ impl ApiConfig {
         self.auth_log = Some(Arc::clone(&auth_log));
 
         commando_sock.register_command("api-auth-log-reopen".into(), move |_args| {
-            println!("re-opening auth-log file");
+            log::info!("re-opening auth-log file");
             auth_log.lock().unwrap().reopen()?;
             Ok(serde_json::Value::Null)
         })?;
diff --git a/proxmox-rest-server/src/command_socket.rs b/proxmox-rest-server/src/command_socket.rs
index 46814c4f..be4a72a1 100644
--- a/proxmox-rest-server/src/command_socket.rs
+++ b/proxmox-rest-server/src/command_socket.rs
@@ -31,7 +31,7 @@ where
             let (conn, _addr) = match socket.accept().await {
                 Ok(data) => data,
                 Err(err) => {
-                    eprintln!("failed to accept on control socket {:?}: {}", path, err);
+                    log::error!("failed to accept on control socket {:?}: {}", path, err);
                     continue;
                 }
             };
@@ -40,7 +40,7 @@ where
             let cred = match socket::getsockopt(conn.as_raw_fd(), opt) {
                 Ok(cred) => cred,
                 Err(err) => {
-                    eprintln!("no permissions - unable to read peer credential - {}", err);
+                    log::error!("no permissions - unable to read peer credential - {}", err);
                     continue;
                 }
             };
@@ -48,7 +48,7 @@ where
             // check permissions (same gid, root user, or backup group)
             let mygid = unsafe { libc::getgid() };
             if !(cred.uid() == 0 || cred.gid() == mygid || cred.gid() == gid) {
-                eprintln!("no permissions for {:?}", cred);
+                log::error!("no permissions for {:?}", cred);
                 continue;
             }
 
@@ -69,7 +69,7 @@ where
                             Ok(0) => break,
                             Ok(_) => (),
                             Err(err) => {
-                                eprintln!("control socket {:?} read error: {}", path, err);
+                                log::error!("control socket {:?} read error: {}", path, err);
                                 return;
                             }
                         }
@@ -83,7 +83,7 @@ where
                         };
 
                         if let Err(err) = tx.write_all(response.as_bytes()).await {
-                            eprintln!("control socket {:?} write response error: {}", path, err);
+                            log::error!("control socket {:?} write response error: {}", path, err);
                             return;
                         }
                     }
diff --git a/proxmox-rest-server/src/file_logger.rs b/proxmox-rest-server/src/file_logger.rs
index 7d4d3f86..6aec3422 100644
--- a/proxmox-rest-server/src/file_logger.rs
+++ b/proxmox-rest-server/src/file_logger.rs
@@ -122,7 +122,7 @@ impl FileLogger {
         if let Err(err) = self.file.write_all(line.as_bytes()) {
             // avoid panicking, log methods should not do that
             // FIXME: or, return result???
-            eprintln!("error writing to log file - {}", err);
+            log::error!("error writing to log file - {}", err);
         }
     }
 }
-- 
2.30.2





More information about the pbs-devel mailing list