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 01D88A14C5 for ; Wed, 14 Jun 2023 15:06:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D89B21CC6C for ; Wed, 14 Jun 2023 15:06:05 +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 for ; Wed, 14 Jun 2023 15:06:01 +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 9AA3445332 for ; Wed, 14 Jun 2023 15:06:01 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 14 Jun 2023 15:05:58 +0200 Message-Id: <20230614130558.82148-1-f.ebner@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.047 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [safesyslog.pm] Subject: [pve-devel] [PATCH common] syslog: interpret priority level 'warn' correctly X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jun 2023 13:06:06 -0000 There are some use sites, e.g. HA manager, pvescheduler that incorrectly use priority level 'warn'. Likely because that is allowed for some other log helpers in the codebase. Instead of fixing them all one-by-one, simply allow 'warn' as a priority too. Suggested-by: Thomas Lamprecht Signed-off-by: Fiona Ebner --- src/PVE/SafeSyslog.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/PVE/SafeSyslog.pm b/src/PVE/SafeSyslog.pm index 7d3e7a7..af105a1 100644 --- a/src/PVE/SafeSyslog.pm +++ b/src/PVE/SafeSyslog.pm @@ -18,7 +18,11 @@ my $log_tag = "unknown"; # it corrupts the DBD database connection! sub syslog { - eval { Sys::Syslog::syslog (@_); }; # ignore errors + my ($level, @param) = @_; + + $level = 'warning' if $level eq 'warn'; + + eval { Sys::Syslog::syslog ($level, @param); }; # ignore errors } sub initlog { -- 2.39.2