cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #6655 catch unicode encoding errors before sending to syslog

Browse source
This commit is contained in:
James Tanner 2014-03-25 16:07:05 -04:00
parent 7b8d1c0ffd
commit 3194fbd365
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/module_utils/basic.py
View file

@ -804,6 +804,12 @@ class AnsibleModule(object):
else: else:
msg = 'Invoked' msg = 'Invoked'
# 6655 - allow for accented characters
try:
msg = unicode(msg).encode('utf8')
except UnicodeDecodeError, e:
pass
if (has_journal): if (has_journal):
journal_args = ["MESSAGE=%s %s" % (module, msg)] journal_args = ["MESSAGE=%s %s" % (module, msg)]
journal_args.append("MODULE=%s" % os.path.basename(__file__)) journal_args.append("MODULE=%s" % os.path.basename(__file__))
@ -814,10 +820,10 @@ class AnsibleModule(object):
except IOError, e: except IOError, e:
# fall back to syslog since logging to journal failed # fall back to syslog since logging to journal failed
syslog.openlog(str(module), 0, syslog.LOG_USER) syslog.openlog(str(module), 0, syslog.LOG_USER)
syslog.syslog(syslog.LOG_NOTICE, unicode(msg).encode('utf8')) syslog.syslog(syslog.LOG_NOTICE, msg) #1
else: else:
syslog.openlog(str(module), 0, syslog.LOG_USER) syslog.openlog(str(module), 0, syslog.LOG_USER)
syslog.syslog(syslog.LOG_NOTICE, unicode(msg).encode('utf8')) syslog.syslog(syslog.LOG_NOTICE, msg) #2
def _set_cwd(self): def _set_cwd(self):
try: try: