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 2AE407BB7E for ; Wed, 13 Jul 2022 11:10:17 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1AE412F17B for ; Wed, 13 Jul 2022 11:09:47 +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, 13 Jul 2022 11:09:46 +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 28F6540888 for ; Wed, 13 Jul 2022 11:09:46 +0200 (CEST) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Wed, 13 Jul 2022 11:09:35 +0200 Message-Id: <20220713090935.4725-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.192 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: [pmg-devel] [PATCH pmg-api v2] pmg-daily: avoid short-circuting update of local channels X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2022 09:10:17 -0000 by using ||= directly with the actual update call, it does not get run, if `sa-update` already returned that a restart is needed. reported in our community forum: https://forum.proxmox.com/threads/.112112/ Signed-off-by: Stoiko Ivanov --- v1->v2: * dropped the temporary variable in favor of a post-if (more in line with our remaining code - and actually prettier imho) - thx@Thomas for the suggestion! src/bin/pmg-daily | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/pmg-daily b/src/bin/pmg-daily index b06515c..d67a88a 100755 --- a/src/bin/pmg-daily +++ b/src/bin/pmg-daily @@ -85,7 +85,7 @@ if (system('sa-update') == 0) { } eval { - $restart_filter ||= PMG::Utils::update_local_spamassassin_channels(0); + $restart_filter = 1 if PMG::Utils::update_local_spamassassin_channels(0); }; syslog('err', "$@") if $@; -- 2.30.2