Changeset 710
- Timestamp:
- Oct 27, 2007 5:15:45 AM (13 years ago)
- Location:
- branches/testScripts
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/testScripts/NBemail.py
r706 r710 6 6 import smtplib 7 7 8 import NBuserParameters9 8 import NBprojectConfig 10 9 import NBlogMessages 10 11 execfile('NBuserParametersDefault.py') 12 execfile('NBuserParameters.py') 11 13 12 14 #------------------------------------------------------------------------ … … 27 29 curDir = os.getcwd() 28 30 29 toAddrs = [unscrambleAddress(NBuserParameters.MY_EMAIL_ADDR)] 30 if NBprojectConfig.PROJECT_EMAIL_ADDRS.has_key(project) \ 31 and \ 32 NBuserParameters.SEND_MAIL_TO_PROJECT_MANAGER: 31 toAddrs = [unscrambleAddress(MY_EMAIL_ADDR)] 32 if SEND_MAIL_TO_PROJECT_MANAGER and NBprojectConfig.PROJECT_EMAIL_ADDRS.has_key(project) : 33 33 scrambledEmailAddress=NBprojectConfig.PROJECT_EMAIL_ADDRS[project] 34 34 unscrambledEmailAddress=unscrambleAddress(scrambledEmailAddress) … … 94 94 def send(toAddrs,subject,message): 95 95 96 sender = unscrambleAddress( NBuserParameters.SENDER_EMAIL_ADDR)96 sender = unscrambleAddress(SENDER_EMAIL_ADDR) 97 97 msgWHeader = ("From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n" 98 98 % (sender, ", ".join(toAddrs), subject)) … … 100 100 101 101 #store email in a file instead of sending 102 if len( NBuserParameters.EMAIL_STOREFILE) > 0 and not NBuserParameters.EMAIL_STOREFILE.isspace() :103 NBlogMessages.writeMessage( ' store email in file '+ NBuserParameters.EMAIL_STOREFILE)104 emailfile=open(N BuserParameters.NIGHTLY_BUILD_ROOT_DIR+'/'+NBuserParameters.EMAIL_STOREFILE, 'a')102 if len(EMAIL_STOREFILE) > 0 and not EMAIL_STOREFILE.isspace() : 103 NBlogMessages.writeMessage( ' store email in file '+EMAIL_STOREFILE) 104 emailfile=open(NIGHTLY_BUILD_ROOT_DIR+'/'+EMAIL_STOREFILE, 'a') 105 105 emailfile.write(msgWHeader) 106 106 emailfile.write("\n============ EMAIL END ======================================\n") … … 109 109 110 110 # Get smtp server password 111 if os.path.isfile( NBuserParameters.SMTP_PASSWORD_FILENAME) :112 pwFilePtr = open( NBuserParameters.SMTP_PASSWORD_FILENAME,'r')111 if os.path.isfile(SMTP_PASSWORD_FILENAME) : 112 pwFilePtr = open(SMTP_PASSWORD_FILENAME,'r') 113 113 smtppass = pwFilePtr.read().strip() 114 114 #print smtppass 115 115 pwFilePtr.close() 116 116 else : 117 NBlogMessages.writeMessage( "Failure reading pwFileName=" + NBuserParameters.SMTP_PASSWORD_FILENAME )117 NBlogMessages.writeMessage( "Failure reading pwFileName=" + SMTP_PASSWORD_FILENAME ) 118 118 sys.exit(1) 119 119 120 session = smtplib.SMTP( NBuserParameters.SMTP_SERVER_NAME,NBuserParameters.SMTP_SERVER_PORT)120 session = smtplib.SMTP(SMTP_SERVER_NAME,SMTP_SERVER_PORT) 121 121 #session.set_debuglevel(1) 122 if NBuserParameters.SMTP_SSL_SERVER==1 :122 if SMTP_SSL_SERVER==1 : 123 123 session.ehlo('x') 124 124 session.starttls() 125 125 session.ehlo('x') 126 session.login(unscrambleAddress( NBuserParameters.SMTP_USER_NAME),smtppass)126 session.login(unscrambleAddress(SMTP_USER_NAME),smtppass) 127 127 128 128 rc = session.sendmail(sender,toAddrs,msgWHeader) -
branches/testScripts/NBlogMessages.py
r706 r710 2 2 3 3 import time 4 import NBuserParameters 4 5 execfile('NBuserParametersDefault.py') 6 execfile('NBuserParameters.py') 5 7 6 8 #TODO: one could open the logfile once in the beginning, set it to sys.stdout, flush after each message, and close it finally … … 12 14 logMsg = time.ctime(time.time())+': ' 13 15 logMsg += msg 14 if NBuserParameters.LOGPRINT :16 if LOGPRINT : 15 17 print logMsg 16 if len( NBuserParameters.LOGFILE) > 0 and not NBuserParameters.LOGFILE.isspace() :17 logfile=open(N BuserParameters.NIGHTLY_BUILD_ROOT_DIR+'/'+NBuserParameters.LOGFILE, 'a')18 if len(LOGFILE) > 0 and not LOGFILE.isspace() : 19 logfile=open(NIGHTLY_BUILD_ROOT_DIR+'/'+LOGFILE, 'a') 18 20 logfile.write(logMsg+'\n') 19 21 # logfile.flush()
Note: See TracChangeset
for help on using the changeset viewer.