Improved error handling in job_mail_sender
authorEd Bartosh <eduard.bartosh@intel.com>
Mon, 14 Oct 2013 11:57:57 +0000 (14:57 +0300)
committerGerrit Code Review <gerrit2@otctools.jf.intel.com>
Tue, 15 Oct 2013 03:35:10 +0000 (20:35 -0700)
Now jobs performs sanity check for configuration parameters and returns
1 if it fails.

Fixes: #1225

Change-Id: I4c7223589ec601f22b1675f75dacaa1388e05c33
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
job_mail_sender.py

index 58f5a3f..37eae0c 100755 (executable)
@@ -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())