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 06040695AB for ; Thu, 11 Mar 2021 09:14:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F13DC24B69 for ; Thu, 11 Mar 2021 09:14:13 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 7B66524B5B for ; Thu, 11 Mar 2021 09:14:13 +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 43A2544BEF for ; Thu, 11 Mar 2021 09:14:13 +0100 (CET) To: Thomas Lamprecht , Proxmox Backup Server development discussion References: <20210311072930.4805-1-d.csapak@proxmox.com> <74fc0424-b7c0-04f8-915d-c370b32a2706@proxmox.com> From: Dominik Csapak Message-ID: Date: Thu, 11 Mar 2021 09:14:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <74fc0424-b7c0-04f8-915d-c370b32a2706@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit 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 NICE_REPLY_A -0.001 Looks like a legit reply (A) 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: Re: [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Mar 2021 08:14:14 -0000 On 3/11/21 9:09 AM, Thomas Lamprecht wrote: > On 11.03.21 08:29, Dominik Csapak wrote: >> so that we get consistent formatted mails from pbs >> (e.g. html part and author) >> >> Signed-off-by: Dominik Csapak >> --- >> 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( > > we explicitly made that private, all other notfies happen in this place, > send_updates_available > > why does tape needs to be extra and have half here "send_tape_backup_status" and > half in other modules? > >> 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( > > why not just move this to server::email_notifications ? yes makes sense, i'll send a v2 > >> @@ -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) >> } >> >