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 92AEEB05B for ; Fri, 8 Sep 2023 16:01:49 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 78A0713406 for ; Fri, 8 Sep 2023 16:01:19 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 8 Sep 2023 16:01:18 +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 6DF454328E for ; Fri, 8 Sep 2023 16:01:18 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Fri, 8 Sep 2023 16:01:14 +0200 Message-Id: <20230908140114.266139-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.420 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mod.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2] close #3777: Add source information to backup logs 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: Fri, 08 Sep 2023 14:01:49 -0000 This will show the ip-address of the client creating the backup in the logs. For example it will output: "starting new backup on datastore 'test1' from ::ffff:192.168.1.192: "host/test/2023-08-21T07:28:10Z"". Signed-off-by: Gabriel Goller --- update v1: - improved unwrapping of ip adress src/api2/backup/mod.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/api2/backup/mod.rs b/src/api2/backup/mod.rs index 652d5baa..18fad745 100644 --- a/src/api2/backup/mod.rs +++ b/src/api2/backup/mod.rs @@ -214,9 +214,12 @@ fn upgrade_to_backup_protocol( env.debug = debug; env.last_backup = last_backup; + let origin = match rpcenv.get_client_ip().map(|addr| addr.ip()) { + Some(ip) => format!(" from {ip}"), + None => "".into(), + }; env.log(format!( - "starting new {} on datastore '{}': {:?}", - worker_type, store, path + "starting new {worker_type} on datastore '{store}'{origin}: {path:?}", )); let service = -- 2.39.2