diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-02-04 11:22:14 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-02-04 11:22:14 -0300 |
| commit | 4b99d4560260498b7ce783ffabba65adfecf7602 (patch) | |
| tree | f12ce9c031fd701931d0ec7e18a0c6c632a05147 /src/leap/bitmask/util | |
| parent | aae34b8e39de97bd5631f61b909842471526a760 (diff) | |
| parent | 2ea1ffae0423355e626145dcd30d52fdc1b2fee6 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/feature/update-log-format' into develop
Diffstat (limited to 'src/leap/bitmask/util')
| -rw-r--r-- | src/leap/bitmask/util/__init__.py | 5 | ||||
| -rw-r--r-- | src/leap/bitmask/util/leap_log_handler.py | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/leap/bitmask/util/__init__.py b/src/leap/bitmask/util/__init__.py index c35be99e..2b2cd874 100644 --- a/src/leap/bitmask/util/__init__.py +++ b/src/leap/bitmask/util/__init__.py @@ -28,6 +28,11 @@ from leap.common.config import get_path_prefix as common_get_path_prefix # We'll give your money back if it does not alleviate the eye strain, at least. +# levelname length == 8, since 'CRITICAL' is the longest +LOG_FORMAT = ('%(asctime)s - %(levelname)-8s - ' + 'L#%(lineno)-4s : %(name)s:%(funcName)s() - %(message)s') + + def first(things): """ Return the head of a collection. diff --git a/src/leap/bitmask/util/leap_log_handler.py b/src/leap/bitmask/util/leap_log_handler.py index 1ab62331..807e53d4 100644 --- a/src/leap/bitmask/util/leap_log_handler.py +++ b/src/leap/bitmask/util/leap_log_handler.py @@ -21,6 +21,8 @@ import logging from PySide import QtCore +from leap.bitmask.util import LOG_FORMAT + class LogHandler(logging.Handler): """ @@ -52,10 +54,7 @@ class LogHandler(logging.Handler): :param logging_level: the debug level to define the color. :type logging_level: str. """ - log_format = ('%(asctime)s - %(name)s:%(funcName)s:L#%(lineno)s ' - '- %(levelname)s - %(message)s') - formatter = logging.Formatter(log_format) - + formatter = logging.Formatter(LOG_FORMAT) return formatter def emit(self, logRecord): |