lavatech/rana-cli
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

correctly display caller and lineno in log file when debug is true.

Browse source
This commit is contained in:
Alan Hamlett 2015-05-13 03:00:00 -07:00
parent 7eb7aa80b4
commit 652bf480e3
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
wakatime/logger.py
View file

@ -9,7 +9,6 @@
:license: BSD, see LICENSE for more details. :license: BSD, see LICENSE for more details.
""" """
import inspect
import logging import logging
import os import os
import sys import sys
@ -38,33 +37,32 @@ class CustomEncoder(json.JSONEncoder):
class JsonFormatter(logging.Formatter): class JsonFormatter(logging.Formatter):
def setup(self, timestamp, isWrite, targetFile, version, plugin): def setup(self, timestamp, isWrite, targetFile, version, plugin, verbose):
self.timestamp = timestamp self.timestamp = timestamp
self.isWrite = isWrite self.isWrite = isWrite
self.targetFile = targetFile self.targetFile = targetFile
self.version = version self.version = version
self.plugin = plugin self.plugin = plugin
self.verbose = verbose
def format(self, record): def format(self, record):
data = OrderedDict([ data = OrderedDict([
('now', self.formatTime(record, self.datefmt)), ('now', self.formatTime(record, self.datefmt)),
]) ])
try:
data['package'] = inspect.stack()[9][0].f_globals.get('__package__')
data['lineno'] = inspect.stack()[9][2]
except:
pass
data['version'] = self.version data['version'] = self.version
data['plugin'] = self.plugin data['plugin'] = self.plugin
data['time'] = self.timestamp data['time'] = self.timestamp
if self.verbose:
data['caller'] = record.pathname
data['lineno'] = record.lineno
data['isWrite'] = self.isWrite data['isWrite'] = self.isWrite
data['file'] = self.targetFile data['file'] = self.targetFile
if not self.isWrite:
del data['isWrite']
data['level'] = record.levelname data['level'] = record.levelname
data['message'] = record.msg data['message'] = record.msg
if not self.plugin: if not self.plugin:
del data['plugin'] del data['plugin']
if not self.isWrite:
del data['isWrite']
return CustomEncoder().encode(data) return CustomEncoder().encode(data)
def formatException(self, exc_info): def formatException(self, exc_info):
@ -90,6 +88,7 @@ def setup_logging(args, version):
targetFile=args.targetFile, targetFile=args.targetFile,
version=version, version=version,
plugin=args.plugin, plugin=args.plugin,
verbose=args.verbose,
) )
logger.handlers[0].setFormatter(formatter) logger.handlers[0].setFormatter(formatter)
return logger return logger
@ -104,6 +103,7 @@ def setup_logging(args, version):
targetFile=args.targetFile, targetFile=args.targetFile,
version=version, version=version,
plugin=args.plugin, plugin=args.plugin,
verbose=args.verbose,
) )
handler.setFormatter(formatter) handler.setFormatter(formatter)
logger.addHandler(handler) logger.addHandler(handler)