Changeset 669

Timestamp:

Oct 23, 2007 9:19:03 AM (13 years ago)

Author:

stefan

Message:

switch for stdout-log independent of logfile

Location:

branches/testScripts

Files:

• NBlogMessages.py (modified) (1 diff)
• NBuserConfig.py (modified) (2 diffs)
• userParametersEmpty.py (modified) (1 diff)

branches/testScripts/NBlogMessages.py

@@ -12 +12 @@
   logMsg = time.ctime(time.time())+': '
   logMsg += msg
-  if len(NBuserConfig.LOGFILE) == 0 or NBuserConfig.LOGFILE.isspace() :
+  if NBuserConfig.LOGPRINT :
     print logMsg
-  else :
+  if len(NBuserConfig.LOGFILE) > 0 and not NBuserConfig.LOGFILE.isspace() :
     logfile=open(NBuserConfig.NIGHTLY_BUILD_ROOT_DIR+'/'+NBuserConfig.LOGFILE, 'a')
     logfile.write(logMsg+'\n')

branches/testScripts/NBuserConfig.py

@@ -21 +21 @@
 
 #----------------------------------------------------------------------
+# LOGPRINT:
+#   switch for logoutput to stdout. If set to 1 (default) log will go to
+#   stdout, if set to 0, then not.
 # LOGFILE: 
-#   file where log messages from the nightlyBuild system will be stored
-#   If no file is given, then we will print to stdout.
+#   If not empty, then log messages will go to this file.
+#   If LOGPRINT is 1, then log messages will go to stdout as well.
 #   The LOGFILE will be used relative to the NIGHTLY_BUILD_ROOT_DIR, i.e.,
 #   log will be written into NIGHTLY_BUILD_ROOT_DIR+'/'+LOGFILE
 #----------------------------------------------------------------------
 
+LOGPRINT='1'
 LOGFILE=''
         
@@ -168 +172 @@
 # CONFIGURE_FLAGS = userParameters.data['CONFIGURE_FLAGS'] 
 # LOGFILE = userParameters.data['LOGFILE'] 
+# LOGPRINT = userParameters.data['LOGPRINT'] 

branches/testScripts/userParametersEmpty.py

@@ -17 +17 @@
 'DOWNLOAD_3RD_PARTY': '',
 'CONFIGURE_FLAGS': '',
-'LOGFILE': ''
+'LOGFILE': '',
+'LOGPRINT': '1',
 }