Fixes ansible#6655 catch unicode encoding errors before sending to sy…

…slog
dragon3 · Mar 25, 2014 · 3194fbd · 3194fbd
1 parent 7b8d1c0
commit 3194fbd
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/ansible/module_utils/basic.py b/lib/ansible/module_utils/basic.py
@@ -804,6 +804,12 @@ def _log_invocation(self):
         else:
             msg = 'Invoked'
 
+        # 6655 - allow for accented characters
+        try:
+            msg = unicode(msg).encode('utf8')
+        except UnicodeDecodeError, e:
+            pass
+
         if (has_journal):
             journal_args = ["MESSAGE=%s %s" % (module, msg)]
             journal_args.append("MODULE=%s" % os.path.basename(__file__))
@@ -814,10 +820,10 @@ def _log_invocation(self):
             except IOError, e:
                 # fall back to syslog since logging to journal failed
                 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:
             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):
         try: