From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 1/2] tape/send_load_media_email: reuse send_job_status_mail
Date: Thu, 11 Mar 2021 08:29:29 +0100 [thread overview]
Message-ID: <20210311072930.4805-1-d.csapak@proxmox.com> (raw)
so that we get consistent formatted mails from pbs
(e.g. html part and author)
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/server/email_notifications.rs | 2 +-
src/tape/changer/email.rs | 13 ++-----------
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/server/email_notifications.rs b/src/server/email_notifications.rs
index 306e84d0..a30c4d1a 100644
--- a/src/server/email_notifications.rs
+++ b/src/server/email_notifications.rs
@@ -205,7 +205,7 @@ lazy_static::lazy_static!{
};
}
-fn send_job_status_mail(
+pub fn send_job_status_mail(
email: &str,
subject: &str,
text: &str,
diff --git a/src/tape/changer/email.rs b/src/tape/changer/email.rs
index abd7ead8..5c6477cd 100644
--- a/src/tape/changer/email.rs
+++ b/src/tape/changer/email.rs
@@ -1,6 +1,6 @@
use anyhow::Error;
-use proxmox::tools::email::sendmail;
+use crate::server::send_job_status_mail;
/// Send email to a person to request a manual media change
pub fn send_load_media_email(
@@ -23,14 +23,5 @@ pub fn send_load_media_email(
text.push_str(&format!("Drive: {}\n", drive));
text.push_str(&format!("Media: {}\n", label_text));
- sendmail(
- &[to],
- &subject,
- Some(&text),
- None,
- None,
- None,
- )?;
-
- Ok(())
+ send_job_status_mail(to, &subject, &text)
}
--
2.20.1
next reply other threads:[~2021-03-11 7:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 7:29 Dominik Csapak [this message]
2021-03-11 7:29 ` [pbs-devel] [PATCH proxmox-backup 2/2] server/worker_task: improve endtime for unknown tasks Dominik Csapak
2021-03-11 8:09 ` [pbs-devel] [PATCH proxmox-backup 1/2] tape/send_load_media_email: reuse send_job_status_mail Thomas Lamprecht
2021-03-11 8:14 ` Dominik Csapak
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=20210311072930.4805-1-d.csapak@proxmox.com \
--to=d.csapak@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal