From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
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) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id BA96269508
for <pbs-devel@lists.proxmox.com>; Thu, 11 Mar 2021 08:30:01 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id AC8C92451D
for <pbs-devel@lists.proxmox.com>; Thu, 11 Mar 2021 08:29:31 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[212.186.127.180])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 282B924512
for <pbs-devel@lists.proxmox.com>; Thu, 11 Mar 2021 08:29:31 +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 EB70041DC2
for <pbs-devel@lists.proxmox.com>; Thu, 11 Mar 2021 08:29:30 +0100 (CET)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Thu, 11 Mar 2021 08:29:29 +0100
Message-Id: <20210311072930.4805-1-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.193 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/,
medium trust
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [pbs-devel] [PATCH proxmox-backup 1/2] tape/send_load_media_email:
reuse send_job_status_mail
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 11 Mar 2021 07:30:01 -0000
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