[core] add trace log level and add new "loglevel" internal input for node default log level

Author: Alxiice

bin/meshroom_batch

@@ -6,7 +6,7 @@ import distutils.util
 import json
 import re
 
-from meshroom import setupEnvironment
+from meshroom import setupEnvironment, logStringToPython
 
 setupEnvironment()
 
@@ -131,14 +131,6 @@ advanced_group.add_argument(
 args = parser.parse_args()
 
 
-logStringToPython = {
-    'fatal': logging.FATAL,
-    'error': logging.ERROR,
-    'warning': logging.WARNING,
-    'info': logging.INFO,
-    'debug': logging.DEBUG,
-    'trace': logging.DEBUG,
-}
 logging.getLogger().setLevel(logStringToPython[args.verbose])
 
 if not args.input and not args.inputRecursive:

meshroom/__init__.py

@@ -48,13 +48,32 @@ class VersionStatus(Enum):
 
 useMultiChunks = util.strtobool(os.environ.get("MESHROOM_USE_MULTI_CHUNKS", "True"))
 
+# Logging
+
+def addTraceLevel():
+    """ From https://stackoverflow.com/a/35804945 """
+    levelName, methodName, levelNum = 'TRACE', 'trace', logging.DEBUG - 5
+    if hasattr(logging, levelName) or hasattr(logging, methodName)or hasattr(logging.getLoggerClass(), methodName):
+       return
+    def logForLevel(self, message, *args, **kwargs):
+        if self.isEnabledFor(levelNum):
+            self._log(levelNum, message, args, **kwargs)
+    def logToRoot(message, *args, **kwargs):
+        logging.log(levelNum, message, *args, **kwargs)
+
+    logging.addLevelName(levelNum, levelName)
+    setattr(logging, levelName, levelNum)
+    setattr(logging.getLoggerClass(), methodName, logForLevel)
+    setattr(logging, methodName, logToRoot)
+
+addTraceLevel()
 logStringToPython = {
-    'fatal': logging.FATAL,
+    'fatal': logging.CRITICAL,
     'error': logging.ERROR,
     'warning': logging.WARNING,
     'info': logging.INFO,
     'debug': logging.DEBUG,
-    'trace': logging.DEBUG,
+    'trace': logging.TRACE,
 }
 logging.getLogger().setLevel(logStringToPython[os.environ.get('MESHROOM_VERBOSE', 'warning')])
 

meshroom/core/desc/node.py

@@ -9,7 +9,7 @@
 import sys
 
 from .computation import Level, StaticNodeSize
-from .attribute import StringParam, ColorParam
+from .attribute import StringParam, ColorParam, ChoiceParam
 
 import meshroom
 from meshroom.core import cgroup
@@ -71,6 +71,14 @@ class BaseNode(object):
             value="",
             invalidate=False,
         ),
+        ChoiceParam(
+            name='loglevel',
+            label='Default logging level',
+            description='''Default logging level for the node (critical, error, warning, info, debug).''',
+            value='info',
+            values=['critical', 'error', 'warning', 'info', 'debug', 'trace'],
+            invalidate=False,
+        ),
         ColorParam(
             name="color",
             label="Color",

meshroom/core/node.py

@@ -309,7 +309,8 @@ def completeProgressBar(self):
 
     @staticmethod
     def textToLevel(text):
-        if text == "critical":
+        text = text.lower()
+        if text in ["critical", "fatal"]:
             return logging.CRITICAL
         elif text == "error":
             return logging.ERROR
@@ -319,6 +320,8 @@ def textToLevel(text):
             return logging.INFO
         elif text == "debug":
             return logging.DEBUG
+        elif text == "trace":
+            return logging.TRACE
         else:
             return logging.NOTSET
 
@@ -725,6 +728,15 @@ def getLabel(self):
                 return label
         return self.getDefaultLabel()
 
+    def getLogLevel(self):
+        """
+        Returns:
+            str: the user-provided log level used for logging on process launched by this node
+        """
+        if self.hasInternalAttribute("loglevel"):
+            return self.internalAttribute("loglevel").value.strip()
+        return "info"
+    
     def getColor(self):
         """
         Returns:
@@ -1315,8 +1327,7 @@ def prepareLogger(self, iteration=-1):
         # Setup logger
         rootLogger = logging.getLogger()
         self._logManager = LogManager(rootLogger, logFile)
-        self._logManager.configureLogger()
-        rootLogger.setLevel(logging.INFO)  # Set info by default
+        self._logManager.start(self.getLogLevel())
 
     def restoreLogger(self):
         self._logManager.restorePreviousLogger()