[pbs-devel] [PATCH proxmox-backup 1/2] tape/send_load_media_email: reuse send_job_status_mail

Dominik Csapak d.csapak at proxmox.com
Thu Mar 11 08:29:29 CET 2021


so that we get consistent formatted mails from pbs
(e.g. html part and author)

Signed-off-by: Dominik Csapak <d.csapak at 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






More information about the pbs-devel mailing list