Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1136)

Unified Diff: devil/devil/utils/logging_common.py

Issue 2972253002: [devil] Extract logging common behavior to its own module. (Closed)
Patch Set: mikecase comments and rebase Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « devil/devil/android/tools/screenshot.py ('k') | devil/devil/utils/run_tests_helper.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: devil/devil/utils/logging_common.py
diff --git a/devil/devil/utils/run_tests_helper.py b/devil/devil/utils/logging_common.py
similarity index 62%
copy from devil/devil/utils/run_tests_helper.py
copy to devil/devil/utils/logging_common.py
index 7c36736a7c181026a013634177aa14e4d6e891d2..5aea3c64eeec742256a04f952afaffb98f5f657a 100644
--- a/devil/devil/utils/run_tests_helper.py
+++ b/devil/devil/utils/logging_common.py
@@ -1,14 +1,33 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2017 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-"""Helper functions common to native, java and host-driven test runners."""
-
import logging
import sys
import time
+def AddLoggingArguments(parser):
+ parser.add_argument(
+ '-v', '--verbose', action='count', default=0,
+ help='Log more. Use multiple times for even more logging.')
+
+
+def InitializeLogging(args, handler=None):
+ if args.verbose == 0:
+ log_level = logging.WARNING
+ elif args.verbose == 1:
+ log_level = logging.INFO
+ else:
+ log_level = logging.DEBUG
+ logger = logging.getLogger()
+ logger.setLevel(log_level)
+ if not handler:
+ handler = logging.StreamHandler(sys.stdout)
+ handler.setFormatter(CustomFormatter())
+ logger.addHandler(handler)
+
+
class CustomFormatter(logging.Formatter):
"""Custom log formatter."""
@@ -29,22 +48,3 @@ class CustomFormatter(logging.Formatter):
timediff = time.time() - self._creation_time
return '%s %8.3fs %s' % (record.levelname[0], timediff, msg)
-
-def SetLogLevel(verbose_count, add_handler=True):
- """Sets log level as |verbose_count|.
-
- Args:
- verbose_count: Verbosity level.
- add_handler: If true, adds a handler with |CustomFormatter|.
- """
- log_level = logging.WARNING # Default.
- if verbose_count == 1:
- log_level = logging.INFO
- elif verbose_count >= 2:
- log_level = logging.DEBUG
- logger = logging.getLogger()
- logger.setLevel(log_level)
- if add_handler:
- custom_handler = logging.StreamHandler(sys.stdout)
- custom_handler.setFormatter(CustomFormatter())
- logging.getLogger().addHandler(custom_handler)
« no previous file with comments | « devil/devil/android/tools/screenshot.py ('k') | devil/devil/utils/run_tests_helper.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698