summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-07 14:55:51 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-07 14:55:51 -0300
commitdff0713f8da773330448bc74b30c7323c8db1e79 (patch)
tree544e9f9d0e96112758e7cd2a7e0f74e851137ca3
parent584866689560bd2ebea01ecc5e6ae5e79ce7fc81 (diff)
parent26ef49e2351cc5a204281b53006e2697ed42ef20 (diff)
Merge remote-tracking branch 'ivan/feature/more-verbose-logs' into develop
-rw-r--r--changes/feature-3923_more-verbose-logs1
-rw-r--r--src/leap/bitmask/app.py2
-rw-r--r--src/leap/bitmask/util/leap_log_handler.py2
3 files changed, 3 insertions, 2 deletions
diff --git a/changes/feature-3923_more-verbose-logs b/changes/feature-3923_more-verbose-logs
new file mode 100644
index 00000000..b6ac6edd
--- /dev/null
+++ b/changes/feature-3923_more-verbose-logs
@@ -0,0 +1 @@
+ o Show more context information in the logs. Closes #3923.
diff --git a/src/leap/bitmask/app.py b/src/leap/bitmask/app.py
index c1859478..5982fe91 100644
--- a/src/leap/bitmask/app.py
+++ b/src/leap/bitmask/app.py
@@ -99,7 +99,7 @@ def add_logger_handlers(debug=False, logfile=None):
logger = logging.getLogger(name='leap')
logger.setLevel(level)
- log_format = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+ log_format = '%(asctime)s - %(name)s:%(funcName)s:L#%(lineno)s - %(levelname)s - %(message)s'
formatter = logging.Formatter(log_format)
# Console handler
diff --git a/src/leap/bitmask/util/leap_log_handler.py b/src/leap/bitmask/util/leap_log_handler.py
index 98924c12..262f2f65 100644
--- a/src/leap/bitmask/util/leap_log_handler.py
+++ b/src/leap/bitmask/util/leap_log_handler.py
@@ -52,7 +52,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 - %(levelname)s - %(message)s'
+ log_format = '%(asctime)s - %(name)s:%(funcName)s:L#%(lineno)s - %(levelname)s - %(message)s'
formatter = logging.Formatter(log_format)
return formatter