diff options
author | Tulio Casagrande <tuliocasagrande@gmail.com> | 2017-02-08 10:35:17 -0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-08 10:35:17 -0200 |
commit | 48e5acd386123a06586c20bf192fc18b5471da13 (patch) | |
tree | f6cafa646e933743b0d5a3679d6cf9b101b6f962 /service | |
parent | b31c7cea4048b6e3e529652f006fbd04eb840529 (diff) | |
parent | 2b8268f24dad481bf5274664b8699582f116d83d (diff) |
Merge pull request #962 from pixelated/unhandled-error
Unhandled error
Diffstat (limited to 'service')
-rw-r--r-- | service/pixelated/config/logger.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/service/pixelated/config/logger.py b/service/pixelated/config/logger.py index a1e825a6..bc4ab8d4 100644 --- a/service/pixelated/config/logger.py +++ b/service/pixelated/config/logger.py @@ -42,11 +42,14 @@ def init(debug=False): logging.getLogger('gnupg').addFilter(PrivateKeyFilter()) def formatter(event): - event['log_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(event['log_time'])) - event['log_level'] = event['log_level'].name.upper() - logstring = u'{log_time} [{log_namespace}] {log_level} ' + event['log_format'] + '\n' - return logstring.format(**event) + try: + event['log_time'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(event['log_time'])) + event['log_level'] = event['log_level'].name.upper() + event['log_format'] = str(event['log_format']) + '\n' if event.get('log_format') else '' + logstring = u'{log_time} [{log_namespace}] {log_level} ' + event['log_format'] + return logstring.format(**event) + except Exception as e: + return "Error while formatting log event: {!r}\nOriginal event: {!r}\n".format(e, event) observers = [FileLogObserver(sys.stdout, formatter)] - globalLogBeginner.beginLoggingTo(observers) |