From 6efeba7d754c2f6f757270faba15160ff429a31c Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Mon, 14 Oct 2013 14:57:57 +0300 Subject: [PATCH] Improved error handling in job_mail_sender Now jobs performs sanity check for configuration parameters and returns 1 if it fails. Fixes: #1225 Change-Id: I4c7223589ec601f22b1675f75dacaa1388e05c33 Signed-off-by: Ed Bartosh --- job_mail_sender.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/job_mail_sender.py b/job_mail_sender.py index 58f5a3f..37eae0c 100755 --- a/job_mail_sender.py +++ b/job_mail_sender.py @@ -19,9 +19,17 @@ def main(): msg = base64.b64decode(os.getenv('MESSAGE')) except TypeError: print "Invalid mail message, job aborted!" + return 1 else: - sendmail(os.getenv('FROM'), os.getenv('TO').split(','), msg, \ - os.getenv('SMTP_SERVER')) + fromaddr = os.getenv('FROM') + toaddr = os.getenv('TO') + smtp_server = os.getenv('SMTP_SERVER') + if fromaddr and toaddr and smtp_server: + sendmail(fromaddr, toaddr.split(','), msg, smtp_server) + else: + print "Error: configuration parameters 'FROM', 'TO' "\ + "or 'SMTP_SERVER' are not set" + return 1 if __name__ == '__main__': sys.exit(main()) -- 2.7.4