Change logging formatter to include thread name in testbed provision.
When provisioning duts connected to testbed, change logging formatter to include
thread name. This is to help logs from each provision runs have the dut's
serial, which is set as the thread name.
BUG=b:28848023
TEST=local run, sample log:
dshi1.mtv/results/1046-debug_user/100.96.51.111/debug/autoserv.DEBUG
Change-Id: I02c9641951ef0b7db336466cc97fac72a7f68365
Reviewed-on: https://chromium-review.googlesource.com/347511
Commit-Ready: Dan Shi <dshi@google.com>
Tested-by: Dan Shi <dshi@google.com>
Reviewed-by: Kevin Cheng <kevcheng@chromium.org>
diff --git a/client/common_lib/logging_config.py b/client/common_lib/logging_config.py
index afbae57..711587e 100644
--- a/client/common_lib/logging_config.py
+++ b/client/common_lib/logging_config.py
@@ -48,9 +48,12 @@
FILE_FORMAT = ('%(asctime)s.%(msecs)03d %(levelname)-5.5s|%(module)18.18s:'
'%(lineno)4.4d| %(message)s')
+ FILE_FORMAT_WITH_THREADNAME = (
+ '%(asctime)s.%(msecs)03d %(levelname)-5.5s|%(module)18.18s:'
+ '%(lineno)4.4d| %(threadName)10.10s| %(message)s')
+ DATE_FORMAT = '%m/%d %H:%M:%S'
- file_formatter = logging.Formatter(fmt=FILE_FORMAT,
- datefmt='%m/%d %H:%M:%S')
+ file_formatter = logging.Formatter(fmt=FILE_FORMAT, datefmt=DATE_FORMAT)
CONSOLE_FORMAT = '%(asctime)s %(levelname)-5.5s| %(message)s'
@@ -156,3 +159,19 @@
def configure_logging(self, **kwargs):
pass
+
+
+def add_threadname_in_log():
+ """Change logging formatter to include thread name.
+
+ This is to help logs from each thread runs to include its thread name.
+ """
+ log = logging.getLogger()
+ for handler in logging.getLogger().handlers:
+ if isinstance(handler, logging.FileHandler):
+ log.removeHandler(handler)
+ handler.setFormatter(logging.Formatter(
+ LoggingConfig.FILE_FORMAT_WITH_THREADNAME,
+ LoggingConfig.DATE_FORMAT))
+ log.addHandler(handler)
+ logging.debug('Logging handler\'s format updated with thread name.')