valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix references

Browse Source
This commit is contained in:
Pedro Algarvio 2015-01-07 05:47:50 +00:00
parent 4953576266
commit 04f65c52aa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/log/setup.py
View File

@ -287,7 +287,7 @@ class SaltLoggingClass(six.with_metaclass(LoggingMixInMeta, LOGGING_LOGGER_CLASS
extra = None extra = None
# Let's try to make every logging message unicode # Let's try to make every logging message unicode
if isinstance(msg, string_types) and not isinstance(msg, text_type): if isinstance(msg, six.string_types) and not isinstance(msg, six.text_type):
try: try:
_msg = msg.decode('utf-8', 'replace') _msg = msg.decode('utf-8', 'replace')
except UnicodeDecodeError: except UnicodeDecodeError:
@ -295,7 +295,7 @@ class SaltLoggingClass(six.with_metaclass(LoggingMixInMeta, LOGGING_LOGGER_CLASS
else: else:
_msg = msg _msg = msg
if PY3: if six.PY3:
logrecord = _log_record_factory(name, level, fn, lno, _msg, args, logrecord = _log_record_factory(name, level, fn, lno, _msg, args,
exc_info, func, sinfo) exc_info, func, sinfo)
else: else: