From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DF32170F6C for ; Tue, 10 May 2022 11:02:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CEE5454F2 for ; Tue, 10 May 2022 11:02:21 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id D19B0547C for ; Tue, 10 May 2022 11:02:17 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A865C43298 for ; Tue, 10 May 2022 11:02:17 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 10 May 2022 09:01:56 +0000 Message-Id: <20220510090158.33504-9-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220510090158.33504-1-h.laimer@proxmox.com> References: <20220510090158.33504-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.055 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup rebased 7/9] proxmox-rest-server: replace print with log macro X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 May 2022 09:02:21 -0000 Signed-off-by: Hannes Laimer --- proxmox-rest-server/src/api_config.rs | 4 ++-- proxmox-rest-server/src/command_socket.rs | 13 +++++++------ proxmox-rest-server/src/file_logger.rs | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/proxmox-rest-server/src/api_config.rs b/proxmox-rest-server/src/api_config.rs index 9d257fd1..7ab4f700 100644 --- a/proxmox-rest-server/src/api_config.rs +++ b/proxmox-rest-server/src/api_config.rs @@ -229,7 +229,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) })?; @@ -269,7 +269,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 a7fc7576..bfa42b01 100644 --- a/proxmox-rest-server/src/command_socket.rs +++ b/proxmox-rest-server/src/command_socket.rs @@ -35,7 +35,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; } }; @@ -44,7 +44,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; } }; @@ -52,7 +52,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; } @@ -80,7 +80,7 @@ where Ok(0) => break, Ok(_) => (), Err(err) => { - eprintln!("control socket {:?} read error: {}", path, err); + log::error!("control socket {:?} read error: {}", path, err); return; } } @@ -94,9 +94,10 @@ where }; if let Err(err) = tx.write_all(response.as_bytes()).await { - eprintln!( + log::error!( "control socket {:?} write response error: {}", - path, err + path, + err ); return; } diff --git a/proxmox-rest-server/src/file_logger.rs b/proxmox-rest-server/src/file_logger.rs index eeabadab..2bb1fac6 100644 --- a/proxmox-rest-server/src/file_logger.rs +++ b/proxmox-rest-server/src/file_logger.rs @@ -125,7 +125,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