Changeset 710

Timestamp:

Oct 27, 2007 5:15:45 AM (14 years ago)

Author:

stefan

Message:

allow to have parameters that are defined only in the default file and not the users parameter file

Location:

branches/testScripts

Files:

• NBemail.py (modified) (5 diffs)
• NBlogMessages.py (modified) (2 diffs)

branches/testScripts/NBemail.py

@@ -6 +6 @@
 import smtplib
 
-import NBuserParameters
 import NBprojectConfig
 import NBlogMessages
+
+execfile('NBuserParametersDefault.py')
+execfile('NBuserParameters.py')
 
 #------------------------------------------------------------------------
@@ -27 +29 @@
   curDir = os.getcwd()
 
-  toAddrs = [unscrambleAddress(NBuserParameters.MY_EMAIL_ADDR)]
-  if NBprojectConfig.PROJECT_EMAIL_ADDRS.has_key(project) \
-     and \
-     NBuserParameters.SEND_MAIL_TO_PROJECT_MANAGER:
+  toAddrs = [unscrambleAddress(MY_EMAIL_ADDR)]
+  if SEND_MAIL_TO_PROJECT_MANAGER and NBprojectConfig.PROJECT_EMAIL_ADDRS.has_key(project) :
     scrambledEmailAddress=NBprojectConfig.PROJECT_EMAIL_ADDRS[project]
     unscrambledEmailAddress=unscrambleAddress(scrambledEmailAddress)
@@ -94 +94 @@
 def send(toAddrs,subject,message):
 
-  sender = unscrambleAddress(NBuserParameters.SENDER_EMAIL_ADDR)  
+  sender = unscrambleAddress(SENDER_EMAIL_ADDR)  
   msgWHeader = ("From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n"
        % (sender, ", ".join(toAddrs), subject))
@@ -100 +100 @@
 
   #store email in a file instead of sending
-  if len(NBuserParameters.EMAIL_STOREFILE) > 0 and not NBuserParameters.EMAIL_STOREFILE.isspace() :
-    NBlogMessages.writeMessage( '  store email in file '+NBuserParameters.EMAIL_STOREFILE)
-    emailfile=open(NBuserParameters.NIGHTLY_BUILD_ROOT_DIR+'/'+NBuserParameters.EMAIL_STOREFILE, 'a')
+  if len(EMAIL_STOREFILE) > 0 and not EMAIL_STOREFILE.isspace() :
+    NBlogMessages.writeMessage( '  store email in file '+EMAIL_STOREFILE)
+    emailfile=open(NIGHTLY_BUILD_ROOT_DIR+'/'+EMAIL_STOREFILE, 'a')
     emailfile.write(msgWHeader)
     emailfile.write("\n============ EMAIL END ======================================\n")
@@ -109 +109 @@
 
   # Get smtp server password
-  if os.path.isfile(NBuserParameters.SMTP_PASSWORD_FILENAME) :
-    pwFilePtr = open(NBuserParameters.SMTP_PASSWORD_FILENAME,'r')
+  if os.path.isfile(SMTP_PASSWORD_FILENAME) :
+    pwFilePtr = open(SMTP_PASSWORD_FILENAME,'r')
     smtppass  = pwFilePtr.read().strip()
     #print smtppass
     pwFilePtr.close()
   else :
-    NBlogMessages.writeMessage( "Failure reading pwFileName=" + NBuserParameters.SMTP_PASSWORD_FILENAME )
+    NBlogMessages.writeMessage( "Failure reading pwFileName=" + SMTP_PASSWORD_FILENAME )
     sys.exit(1)
     
-  session = smtplib.SMTP(NBuserParameters.SMTP_SERVER_NAME,NBuserParameters.SMTP_SERVER_PORT)
+  session = smtplib.SMTP(SMTP_SERVER_NAME,SMTP_SERVER_PORT)
   #session.set_debuglevel(1)
-  if NBuserParameters.SMTP_SSL_SERVER==1 :
+  if SMTP_SSL_SERVER==1 :
     session.ehlo('x')
     session.starttls()
     session.ehlo('x')  
-  session.login(unscrambleAddress(NBuserParameters.SMTP_USER_NAME),smtppass)
+  session.login(unscrambleAddress(SMTP_USER_NAME),smtppass)
 
   rc = session.sendmail(sender,toAddrs,msgWHeader)

branches/testScripts/NBlogMessages.py

@@ -2 +2 @@
 
 import time
-import NBuserParameters
+
+execfile('NBuserParametersDefault.py')
+execfile('NBuserParameters.py')
 
 #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())+': '
   logMsg += msg
-  if NBuserParameters.LOGPRINT :
+  if LOGPRINT :
     print logMsg
-  if len(NBuserParameters.LOGFILE) > 0 and not NBuserParameters.LOGFILE.isspace() :
-    logfile=open(NBuserParameters.NIGHTLY_BUILD_ROOT_DIR+'/'+NBuserParameters.LOGFILE, 'a')
+  if len(LOGFILE) > 0 and not LOGFILE.isspace() :
+    logfile=open(NIGHTLY_BUILD_ROOT_DIR+'/'+LOGFILE, 'a')
     logfile.write(logMsg+'\n')
 #    logfile.flush()