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 00C48B3EC9 for ; Wed, 29 Nov 2023 17:35:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C8937B51B for ; Wed, 29 Nov 2023 17:35:18 +0100 (CET) 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, 29 Nov 2023 17:35:17 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 27DC041659 for ; Wed, 29 Nov 2023 17:35:17 +0100 (CET) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Wed, 29 Nov 2023 17:35:12 +0100 Message-Id: <20231129163512.416113-1-l.wagner@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.008 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 - Subject: [pbs-devel] [PATCH proxmox-backup] server: sync email notification: adapt template for local sync jobs 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: Wed, 29 Nov 2023 16:35:49 -0000 Add a guard clause that checks `job.remote`, otherwise the template fails to render to to handlebars being configured in strict mode. Signed-off-by: Lukas Wagner --- src/server/email_notifications.rs | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/server/email_notifications.rs b/src/server/email_notifications.rs index 18881782..43b55656 100644 --- a/src/server/email_notifications.rs +++ b/src/server/email_notifications.rs @@ -90,11 +90,14 @@ Please visit the web interface for further details: const SYNC_OK_TEMPLATE: &str = r###" -Job ID: {{job.id}} -Datastore: {{job.store}} -Remote: {{job.remote}} -Remote Store: {{job.remote-store}} - +Job ID: {{job.id}} +Datastore: {{job.store}} +{{#if job.remote~}} +Remote: {{job.remote}} +Remote Store: {{job.remote-store}} +{{else~}} +Local Source Store: {{job.remote-store}} +{{/if}} Synchronization successful. @@ -106,11 +109,14 @@ Please visit the web interface for further details: const SYNC_ERR_TEMPLATE: &str = r###" -Job ID: {{job.id}} -Datastore: {{job.store}} -Remote: {{job.remote}} -Remote Store: {{job.remote-store}} - +Job ID: {{job.id}} +Datastore: {{job.store}} +{{#if job.remote~}} +Remote: {{job.remote}} +Remote Store: {{job.remote-store}} +{{else~}} +Local Source Store: {{job.remote-store}} +{{/if}} Synchronization failed: {{error}} -- 2.39.2