[autotest] Remove log prefix for run_suite.py
abort_suite.py and run_suite.py share the same logging setup.
run_suite should not add prefix in log such as timestamp
while prefix like timestamp in abort_suite helps system debugging.
This CL makes only abort_suite print out prefix in logs.
BUG=chromium:446904
TEST=run_suite.py and abort_suite.py on local machine
Change-Id: I8031a05ca83f2258c4631f0f3ffde9e6c176304c
Reviewed-on: https://chromium-review.googlesource.com/239280
Reviewed-by: Mungyung Ryu <mkryu@google.com>
Commit-Queue: Mungyung Ryu <mkryu@google.com>
Tested-by: Mungyung Ryu <mkryu@google.com>
diff --git a/server/site_utils.py b/server/site_utils.py
index c49030e..bf4bc60 100644
--- a/server/site_utils.py
+++ b/server/site_utils.py
@@ -395,12 +395,14 @@
% data_key_dict)
-def setup_logging(logfile=None):
+def setup_logging(logfile=None, prefix=False):
"""Setup basic logging with all logging info stripped.
Calls to logging will only show the message. No severity is logged.
@param logfile: If specified dump output to a file as well.
+ @param prefix: Flag for log prefix. Set to True to add prefix to log
+ entries to include timestamp and log level. Default is False.
"""
# Remove all existing handlers. client/common_lib/logging_config adds
# a StreamHandler to logger when modules are imported, e.g.,
@@ -408,14 +410,17 @@
# log only messages, not severity.
logging.getLogger().handlers = []
+ if prefix:
+ log_format = '%(asctime)s %(levelname)-5s| %(message)s'
+ else:
+ log_format = '%(message)s'
+
screen_handler = logging.StreamHandler()
- screen_handler.setFormatter(logging.Formatter('%(asctime)s '
- '%(levelname)-5s| %(message)s'))
+ screen_handler.setFormatter(logging.Formatter(log_format))
logging.getLogger().addHandler(screen_handler)
logging.getLogger().setLevel(logging.INFO)
if logfile:
file_handler = logging.FileHandler(logfile)
- file_handler.setFormatter(logging.Formatter('%(asctime)s '
- '%(levelname)-5s| %(message)s'))
+ file_handler.setFormatter(logging.Formatter(log_format))
file_handler.setLevel(logging.DEBUG)
logging.getLogger().addHandler(file_handler)