From eb416e589d43c9fb197ce1b8515b07ff05c5e174 Mon Sep 17 00:00:00 2001
From: Anthony Geay <anthony.geay@edf.fr>
Date: Thu, 20 Apr 2023 07:22:25 +0200
Subject: [PATCH] Keep traceback in default SALOME logger

---
 bin/runSalomeCommon.py | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/bin/runSalomeCommon.py b/bin/runSalomeCommon.py
index b0d307d3f..e8994eb22 100755
--- a/bin/runSalomeCommon.py
+++ b/bin/runSalomeCommon.py
@@ -35,10 +35,10 @@ from salomeContextUtils import ScriptAndArgsObjectEncoder
 import platform
 import logging
 
-# Setting formatter in setVerbose() was commented because adding of handler
-# breaks using of root logger in other modules and cause many double lines in logs.
-FORMAT = '%(levelname)s : %(asctime)s : [%(filename)s:%(funcName)s:%(lineno)s] : %(message)s'
-logging.basicConfig(format=FORMAT)
+## Setting formatter in setVerbose() was commented because adding of handler
+## breaks using of root logger in other modules and cause many double lines in logs.
+#FORMAT = '%(levelname)s : %(asctime)s : [%(filename)s:%(funcName)s:%(lineno)s] : %(message)s'
+#logging.basicConfig(format=FORMAT)
 logger = logging.getLogger()
 
 class ColoredFormatter(logging.Formatter):
@@ -71,20 +71,20 @@ class BackTraceFormatter(logging.Formatter):
         return logging.Formatter.format(self, record)
 
 def setVerbose(verbose):
-    # from packaging import version
-    # current_version = version.parse("{}.{}".format(sys.version_info.major,sys.version_info.minor))
-    # version_ref = version.parse("3.5.0")
-    # global logger
-    # formatter = None
-    # if current_version >= version_ref:
-    #     formatter = BackTraceFormatter('%(levelname)s : %(asctime)s : %(message)s ',style='%')
-    # else:
-    #     formatter = logging.Formatter('%(levelname)s : %(asctime)s : %(message)s ',style='%')
-    # formatter.default_time_format = '%H:%M:%S'
-    # formatter.default_msec_format = "%s.%03d"
-    # stream_handler = logging.StreamHandler()
-    # stream_handler.setFormatter(formatter)
-    # logger.addHandler(stream_handler)
+    from packaging import version
+    current_version = version.parse("{}.{}".format(sys.version_info.major,sys.version_info.minor))
+    version_ref = version.parse("3.5.0")
+    global logger
+    formatter = None
+    if current_version >= version_ref:
+        formatter = BackTraceFormatter('%(levelname)s : %(asctime)s : %(message)s ',style='%')
+    else:
+        formatter = logging.Formatter('%(levelname)s : %(asctime)s : %(message)s ',style='%')
+    formatter.default_time_format = '%H:%M:%S'
+    formatter.default_msec_format = "%s.%03d"
+    stream_handler = logging.StreamHandler()
+    stream_handler.setFormatter(formatter)
+    logger.addHandler(stream_handler)
 
     verbose_map = { "0": logging.WARNING, "1": logging.INFO, "2": logging.DEBUG}
     if verbose in verbose_map:
@@ -361,7 +361,7 @@ class CommonSessionServer(Server):
     @abc.abstractmethod
     def getSessionServerExe(self):
         pass
-
+    
     def setpath(self,modules_list,modules_root_dir):
         list_modules = modules_list[:]
         list_modules.reverse()
@@ -412,7 +412,7 @@ class SessionServer(CommonSessionServer):
         super().__init__(args,modules_list,modules_root_dir)
         import KernelBasis
         KernelBasis.setSSLMode(False)
-
+    
     def getSessionServerExe(self):
         return "SALOME_Session_Server"
 # ---
-- 
2.39.2