Przeglądaj źródła

updated logging instantiation

Dimitri Korsch 5 lat temu
rodzic
commit
7b91dfb200
2 zmienionych plików z 11 dodań i 9 usunięć
  1. 1 1
      cvfinetune/__init__.py
  2. 10 8
      cvfinetune/parser/base.py

+ 1 - 1
cvfinetune/__init__.py

@@ -1 +1 @@
-__version__ = "0.4.0"
+__version__ = "0.4.1"

+ 10 - 8
cvfinetune/parser/base.py

@@ -1,10 +1,13 @@
-import os
 import logging
 import logging
+import os
 import platform
 import platform
 import warnings
 import warnings
 
 
 
 
-from cvargparse import GPUParser, Arg, ArgFactory
+from cvargparse import Arg
+from cvargparse import ArgFactory
+from cvargparse import GPUParser
+from cvargparse.utils import logger_config
 
 
 from cvfinetune.parser.dataset_args import add_dataset_args
 from cvfinetune.parser.dataset_args import add_dataset_args
 from cvfinetune.parser.model_args import add_model_args
 from cvfinetune.parser.model_args import add_model_args
@@ -22,16 +25,15 @@ class FineTuneParser(GPUParser):
 
 
 		handler0 = logging.StreamHandler()
 		handler0 = logging.StreamHandler()
 		handler0.addFilter(HostnameFilter())
 		handler0.addFilter(HostnameFilter())
-		handler0.setFormatter(logging.Formatter("<{hostname:^10s}>: " + fmt, style="{"))
+		fmt0 = "<{hostname:^10s}>: " + fmt
 
 
 		filename = logfile if logfile is not None else f"{platform.node()}.log"
 		filename = logfile if logfile is not None else f"{platform.node()}.log"
 		self._file_handler = handler1 = logging.FileHandler(filename=filename, mode="w")
 		self._file_handler = handler1 = logging.FileHandler(filename=filename, mode="w")
-		handler1.setFormatter(logging.Formatter(fmt, style="{"))
 
 
-		logger = logging.getLogger()
-		logger.addHandler(handler0)
-		logger.addHandler(handler1)
-		logger.setLevel(getattr(logging, self.args.loglevel.upper(), logging.DEBUG))
+		logger_config.init_logging_handlers([
+			(handler0, fmt0, logging.INFO),
+			(handler1, fmt, logging.INFO),
+		])
 
 
 
 
 	def __del__(self):
 	def __del__(self):