Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions fluent/handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import logging
import socket
import sys
import traceback

try:
import simplejson as json
Expand Down Expand Up @@ -51,6 +52,9 @@ def format(self, record):
data = dict([(key, value % record.__dict__)
for key, value in self._fmt_dict.items()])

if record.exc_info:
self._add_exception_to_record(record)

self._structuring(data, record.msg)
return data

Expand Down Expand Up @@ -83,6 +87,24 @@ def _add_dic(data, dic):
if isinstance(key, basestring):
data[str(key)] = value

def _add_exception_to_record(self, record):
"""
Adds a traceback to record.msg
"""
tb = traceback.format_exception(*record.exc_info)
tb = ''.join(tb)

if isinstance(record.msg, dict):
record.msg.update({"traceback": tb})
elif isinstance(record.msg, basestring):
record.msg = {"message": record.msg,
"traceback": tb}
else:
record.msg = {
"message": record.getMessage(),
"traceback": tb
}


class FluentHandler(logging.Handler):
'''
Expand Down