X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FblocFissure%2Fgmu%2FinitLog.py;h=57b887e60f42e599f8ed82f21b701840f28d7fe1;hp=63908c1d054101ea46bfdeabaa85bd7563c570a2;hb=16e55e2e69d858b93e742535025d339155e368bb;hpb=5d68554076bbca0e1e95fb0db215a6c2b84b6c54

diff --git a/src/Tools/blocFissure/gmu/initLog.py b/src/Tools/blocFissure/gmu/initLog.py
index 63908c1d0..57b887e60 100644
--- a/src/Tools/blocFissure/gmu/initLog.py
+++ b/src/Tools/blocFissure/gmu/initLog.py
@@ -1,28 +1,81 @@
 # -*- coding: utf-8 -*-
 
 import logging
+import os
 
-def setDebug():
-  logging.basicConfig(format='%(relativeCreated)d %(funcName)s[%(lineno)d] %(message)s',
-                      level=logging.DEBUG)
-  logging.info('start Debug')
+debug = 10
+info = 20
+warning = 30
+error = 40
+critical = 50
 
-def setVerbose():
-  logging.basicConfig(format='%(relativeCreated)d %(funcName)s[%(lineno)d] %(message)s',
-                      level=logging.INFO)
-  logging.info('start Verbose')
+loglevel = warning
+logging.basicConfig(format='%(funcName)s[%(lineno)d] %(message)s',
+                    level=logging.WARNING)
+ch = None
+fh = None
 
-def setRelease():
-  logging.basicConfig(format='%(funcName)s[%(lineno)d] %(message)s',
-                      level=logging.WARNING)
-  logging.warning('start Release')
+def setLogger(logfile, level, formatter):
+  global ch, fh
+  rootLogger = logging.getLogger('')
+  if fh is not None:
+    rootLogger.removeHandler(fh)
+    fh = None
+  if ch is not None:
+    rootLogger.removeHandler(ch)
+    ch = None
+  if logfile:
+    if os.path.exists(logfile):
+      os.remove(logfile)
+    fh = logging.FileHandler(logfile)
+    rootLogger.addHandler(fh)
+    fh.setFormatter(formatter)
+  else:
+    ch = logging.StreamHandler()
+    rootLogger.addHandler(ch)
+    ch.setFormatter(formatter)
+  rootLogger.setLevel(level)
   
-def setUnitTests():
-  logging.basicConfig(format='%(funcName)s[%(lineno)d] %(message)s',
-                      level=logging.CRITICAL)
-  logging.critical('start UnitTests')
   
-  #logging.basicConfig(filename='myapp.log',
-  #                    format='%(asctime)s %(message)s',
-  #                    datefmt='%m/%d/%Y %I:%M:%S %p',
-  #                    level=logging.DEBUG)
+def setDebug(logfile=None):
+  global loglevel
+  loglevel = debug
+  level = logging.DEBUG
+  formatter = logging.Formatter('%(relativeCreated)d %(funcName)s[%(lineno)d] %(message)s')
+  setLogger(logfile, level, formatter)
+  logging.info('start Debug %s', loglevel)
+
+def setVerbose(logfile=None):
+  global loglevel
+  loglevel = info
+  level = logging.INFO
+  formatter = logging.Formatter('%(relativeCreated)d %(funcName)s[%(lineno)d] %(message)s')
+  setLogger(logfile, level, formatter)
+  logging.info('start Verbose %s', loglevel)
+
+def setRelease(logfile=None):
+  global loglevel
+  loglevel = warning
+  level = logging.WARNING
+  formatter = logging.Formatter('%(funcName)s[%(lineno)d] %(message)s')
+  setLogger(logfile, level, formatter)
+  logging.warning('start Release %s', loglevel)
+  
+def setUnitTests(logfile=None):
+  global loglevel
+  loglevel = critical
+  level = logging.CRITICAL
+  formatter = logging.Formatter('%(funcName)s[%(lineno)d] %(message)s')
+  setLogger(logfile, level, formatter)
+  logging.critical('start UnitTests %s', loglevel)
+  
+def setPerfTests(logfile=None):
+  global loglevel
+  loglevel = critical
+  level = logging.CRITICAL
+  formatter = logging.Formatter('%(funcName)s[%(lineno)d] %(message)s')
+  setLogger(logfile, level, formatter)
+  logging.info('start PerfTests %s', loglevel)
+  
+def getLogLevel():
+  return loglevel