public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Lukas Wagner <l.wagner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup] server: sync email notification: adapt template for local sync jobs
Date: Wed, 29 Nov 2023 17:35:12 +0100	[thread overview]
Message-ID: <20231129163512.416113-1-l.wagner@proxmox.com> (raw)

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 <l.wagner@proxmox.com>
---
 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





             reply	other threads:[~2023-11-29 16:35 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-29 16:35 Lukas Wagner [this message]
2023-11-29 16:40 ` [pbs-devel] applied: " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231129163512.416113-1-l.wagner@proxmox.com \
    --to=l.wagner@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal