Changeset 617

Timestamp:

Oct 15, 2007 11:45:18 AM (13 years ago)

Author:

jpfasano

Message:

Moved email functions to their own file

Location:

branches/testScripts

Files:

• NBemail.py (added)
• NBuserConfig.py (modified) (1 diff)
• nightlyBuild.py (modified) (7 diffs)

branches/testScripts/NBuserConfig.py

@@ -55 +55 @@
 #----------------------------------------------------------------------
 PROJECTS = ['CoinUtils','DyLP','Clp','SYMPHONY','Vol','Osi','Cgl','Cbc','Ipopt','OS','CppAD']
-PROJECTS = ['Clp','CppAD']
+PROJECTS = ['CoinUtils','CppAD']
 
 

branches/testScripts/nightlyBuild.py

@@ -10 +10 @@
 import NBprojectConfig
 import NBlogMessages
+import NBemail
 
 # TODO:
@@ -24 +25 @@
 #     to test on in an email dated 10/12/2007 12:01pm
 
-
-#------------------------------------------------------------------------
-# Send email typically about an error.
-#  project: coin project name
-#  cmd: command being exucuted. perhaps: "svn update", "./configure", 
-#       "make".
-#  cmdMsgs: the messages generated by cmd.  This will typically contain
-#       errors issued by cmd.
-#------------------------------------------------------------------------
-def sendEmailCmdMsgs(project,cmdMsgs,cmd):
-  curDir = os.getcwd()
-  
-  toAddrs = [unscrambleEmailAddress(NBuserConfig.MY_EMAIL_ADDR)]
-  if NBprojectConfig.PROJECT_EMAIL_ADDRS.has_key(project) and NBuserConfig.SEND_MAIL_TO_PROJECT_MANAGER:
-    toAddrs.append(unscrambleEmailAddress(NBprojectConfig.PROJECT_EMAIL_ADDRS[project]))
-
-  subject = project + " build problem when running '" + cmd +"'"
-
-  emailMsg  = "'" + cmd + "' from directory " + curDir + " failed.\n\n"
-  emailMsg += "Operating System: "+os.name
-  emailMsg += "'" + cmd + "' messages are:\n" 
-  emailMsg += cmdMsgs
-  sendEmail(toAddrs,subject,emailMsg)
-  NBlogMessages.writeMessage( "  email sent regarding "+project+" running '"+cmd+"'" )
-
-#------------------------------------------------------------------------
-# Send email 
-#------------------------------------------------------------------------
-def sendEmail(toAddrs,subject,message):
-
-  sender = unscrambleEmailAddress(NBuserConfig.SENDER_EMAIL_ADDR)  
-  msgWHeader = ("From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n"
-       % (sender, ", ".join(toAddrs), subject))
-  msgWHeader += message
-  
-  # Get smpt server password
-  if os.path.isfile(NBuserConfig.SMTP_PASSWORD_FILENAME) :
-    pwFilePtr = open(NBuserConfig.SMTP_PASSWORD_FILENAME,'r')
-    smtppass  = pwFilePtr.read().strip()
-    pwFilePtr.close()
-  else :
-    NBlogMessages.writeMessage( "Failure reading pwFileName=" + NBuserConfig.SMTP_PASSWORD_FILENAME )
-    sys.exit(1)
-    
-  session = smtplib.SMTP(NBuserConfig.SMTP_SERVER_NAME,NBuserConfig.SMTP_SERVER_PORT)
-  #session.set_debuglevel(1)
-  if NBuserConfig.SMTP_SSL_SERVER==1 :
-    session.ehlo('x')
-    session.starttls()
-    session.ehlo('x')  
-  session.login(unscrambleEmailAddress(NBuserConfig.SMTP_USER_NAME),smtppass)
-
-  rc = session.sendmail(sender,toAddrs,msgWHeader)
-  if rc!={} :
-    NBlogMessages.writeMessage( 'session.sendmail rc='  )
-    NBlogMessages.writeMessage( rc )
-  session.quit()
-
-#------------------------------------------------------------------------
-# Decrypt email address 
-#------------------------------------------------------------------------
-def unscrambleEmailAddress( scrambledEmailAddress ) :
-  retVal = scrambledEmailAddress
-  retVal = retVal.replace(' _AT_ ','@')
-  retVal = retVal.replace(' _DOT_ ','.')
-  return retVal
 
 #------------------------------------------------------------------------
@@ -143 +78 @@
   rc=commands.getstatusoutput(svnCmd)
   if rc[0] != 0 :
-    sendEmailCmdMsgs(project,rc[1],svnCmd)
+    NBemail.sendCmdMsgs(project,rc[1],svnCmd)
     retVal='Error'
   return retVal
@@ -223 +158 @@
       error_msg += logFilePtr.read()
       logFilePtr.close()
-    sendEmailCmdMsgs(p,error_msg,configCmd)
+    NBemail.sendCmdMsgs(p,error_msg,configCmd)
     continue
 
@@ -234 +169 @@
   # Check if make worked
   if rc[0] != 0 :
-    sendEmailCmdMsgs(p,rc[1],'make')
+    NBemail.sendCmdMsgs(p,rc[1],'make')
     continue
 
@@ -245 +180 @@
   # Check if 'make test' worked
   if didTestFail(rc,p,"make test") :
-    sendEmailCmdMsgs(p,rc[1],"make test")
+    NBemail.sendCmdMsgs(p,rc[1],"make test")
     continue
 
@@ -263 +198 @@
   
     if didTestFail(rc,p,unitTestCmd) :
-      sendEmailCmdMsgs(p,rc[1],unitTestCmd)
+      NBemail.sendCmdMsgs(p,rc[1],unitTestCmd)
       continue