Changeset 32892 for trunk/ippdor/src/executables/send_email.py

Timestamp:

Dec 7, 2011, 4:08:46 PM (15 years ago)

Author:

Serge CHASTEL

Message:

Fixed e-mail script

File:

• trunk/ippdor/src/executables/send_email.py (modified) (1 diff)

trunk/ippdor/src/executables/send_email.py

@@ -6 +6 @@
 """
 import sys
+import smtplib
 
 LABEL = sys.argv[1]
 RECIPIENT = sys.argv[2]
-BODY = ""
 
-BODY_INPUT_FILE = open(sys.argv[3])
-for line in BODY_INPUT_FILE:
-    BODY = "%s%s" % (BODY, line)
+from email.mime.text import MIMEText
+BODY_INPUT_FILE = open(sys.argv[3], 'rb')
+MESSAGE = MIMEText(BODY_INPUT_FILE.read())
 BODY_INPUT_FILE.close()
 
-import smtplib
-from email.mime.text import MIMEText
-MESSAGE = MIMEText(BODY)
-MESSAGE['Subject'] = 'End of Condor processing: [%s]' % LABEL
+MESSAGE['Subject'] = 'End of Condor processing: %s' % LABEL
 _FROM = 'ippdor@ifa.hawaii.edu'
 MESSAGE['From'] = _FROM
 _TO = [ RECIPIENT, 'schastel@ifa.hawaii.edu' ]
-MESSAGE['To'] = _TO
+MESSAGE['To'] = RECIPIENT
 SMTP_CONNECTION = smtplib.SMTP('ippc18.ifa.hawaii.edu')
 SMTP_CONNECTION.sendmail(_FROM, _TO, MESSAGE.as_string())
 SMTP_CONNECTION.quit()
+