saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

This is to fix exessive escaping produced by sending the dict though

Browse source 
a JSON processor and instead relies on msgpack.
This commit is contained in:
Stas Alekseev 2015-07-09 18:46:07 -04:00
parent a3e209d538
commit 231edee777
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/log/handlers/fluent_mod.py
View file

@ -62,10 +62,6 @@ import salt.utils.network
# Import Third party libs
import salt.ext.six as six
try:
import simplejson as json
except ImportError:
import json
log = logging.getLogger(__name__)
@ -218,7 +214,7 @@ class LogstashFormatter(logging.Formatter, NewStyleClassMixIn):
continue
message_dict['@fields'][key] = repr(value)
return json.dumps(message_dict)
return message_dict
def format_v1(self, record):
message_dict = {
@ -262,7 +258,7 @@ class LogstashFormatter(logging.Formatter, NewStyleClassMixIn):
continue
message_dict[key] = repr(value)
return json.dumps(message_dict)
return message_dict
class FluentHandler(logging.Handler):