Changeset 615

Timestamp:

Oct 15, 2007 11:19:25 AM (12 years ago)

Author:

jpfasano

Message:

Added logMessages module(file).
Set nightlyBuild.py property to be executable.

Location:

branches/testScripts

Files:

• NBlogMessages.py (added)
• nightlyBuild.py (modified) (14 diffs, 2 props)

branches/testScripts/nightlyBuild.py

@@ -6 +6 @@
 import smtplib
 import re 
-import time
 
 import NBuserConfig
 import NBprojectConfig
+import NBlogMessages
 
 # TODO:
@@ -47 +47 @@
   emailMsg += cmdMsgs
   sendEmail(toAddrs,subject,emailMsg)
-  writeLogMessage( "  email sent regarding "+project+" running '"+cmd+"'" )
+  NBlogMessages.writeMessage( "  email sent regarding "+project+" running '"+cmd+"'" )
 
 #------------------------------------------------------------------------
@@ -65 +65 @@
     pwFilePtr.close()
   else :
-    writeLogMessage( "Failure reading pwFileName=" + NBuserConfig.SMTP_PASSWORD_FILENAME )
+    NBlogMessages.writeMessage( "Failure reading pwFileName=" + NBuserConfig.SMTP_PASSWORD_FILENAME )
     sys.exit(1)
     
@@ -78 +78 @@
   rc = session.sendmail(sender,toAddrs,msgWHeader)
   if rc!={} :
-    writeLogMessage( 'session.sendmail rc='  )
-    writeLogMessage( rc )
+    NBlogMessages.writeMessage( 'session.sendmail rc='  )
+    NBlogMessages.writeMessage( rc )
   session.quit()
 
@@ -140 +140 @@
   retVal='OK'
   os.chdir(dir)
-  writeLogMessage('  '+svnCmd)
+  NBlogMessages.writeMessage('  '+svnCmd)
   rc=commands.getstatusoutput(svnCmd)
   if rc[0] != 0 :
@@ -146 +146 @@
     retVal='Error'
   return retVal
-
-#------------------------------------------------------------------------
-# Function to write log messages
-#------------------------------------------------------------------------
-def writeLogMessage( msg ) :
-  logMsg = time.ctime(time.time())+': '
-  logMsg += msg
-  print logMsg
 
 #------------------------------------------------------------------------
@@ -188 +180 @@
 #------------------------------------------------------------------------
 for p in NBuserConfig.PROJECTS:
-  writeLogMessage( p )
+  NBlogMessages.writeMessage( p )
   rc = [0]
 
@@ -218 +210 @@
   os.chdir(projectCheckOutDir)
   configCmd = os.path.join('.','configure -C')
-  writeLogMessage('  '+configCmd)
+  NBlogMessages.writeMessage('  '+configCmd)
   rc=commands.getstatusoutput(configCmd)
   
@@ -237 +229 @@
   # Run make part of buid
   #---------------------------------------------------------------------
-  writeLogMessage( '  make' )
+  NBlogMessages.writeMessage( '  make' )
   rc=commands.getstatusoutput('make')
   
@@ -248 +240 @@
   # Run 'make test' part of buid
   #---------------------------------------------------------------------
-  writeLogMessage( '  make test' )
+  NBlogMessages.writeMessage( '  make test' )
   rc=commands.getstatusoutput('make test')
   
@@ -267 +259 @@
     unitTestCmd=unitTestCmd.replace('_MIPLIB3DIR_',miplib3Dir)
 
-    writeLogMessage( '  '+unitTestCmd )
+    NBlogMessages.writeMessage( '  '+unitTestCmd )
     rc=commands.getstatusoutput(unitTestCmd)
   
@@ -278 +270 @@
 
 
-writeLogMessage( "nightlyBuild.py Finished" )
+NBlogMessages.writeMessage( "nightlyBuild.py Finished" )
 
 sys.exit(0)
@@ -322 +314 @@
   pwFilePtr.close()
 else :
-  #writeLogMessage( "Failure reading pwFileName=" + CONFIG_FILENAME )
+  #NBlogMessages.writeMessage( "Failure reading pwFileName=" + CONFIG_FILENAME )
   #print cmdMsgs
   sys.exit( 1)
@@ -367 +359 @@
   pwFilePtr.close()
 else :
-  #writeLogMessage( "Failure reading pwFileName=" + CONFIG_FILENAME )
+  #NBlogMessages.writeMessage( "Failure reading pwFileName=" + CONFIG_FILENAME )
   #print cmdMsgs
   sys.exit( 1)