From 2a04663255c3a06dea430c57d9db2b46d1e81ffd Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 20 Jan 2015 12:40:17 -0800 Subject: [PATCH] Port forward lmacken's fix for 9886 to v2 --- v2/ansible/module_utils/basic.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/v2/ansible/module_utils/basic.py b/v2/ansible/module_utils/basic.py index acaa370437..b5b3cb1451 100644 --- a/v2/ansible/module_utils/basic.py +++ b/v2/ansible/module_utils/basic.py @@ -1094,12 +1094,11 @@ class AnsibleModule(object): msg = msg.encode('utf-8') if (has_journal): - journal_args = ["MESSAGE=%s %s" % (module, msg)] - journal_args.append("MODULE=%s" % os.path.basename(__file__)) + journal_args = [("MODULE", os.path.basename(__file__))] for arg in log_args: - journal_args.append(arg.upper() + "=" + str(log_args[arg])) + journal_args.append((arg.upper(), str(log_args[arg]))) try: - journal.sendv(*journal_args) + journal.send("%s %s" % (module, msg), **dict(journal_args)) except IOError, e: # fall back to syslog since logging to journal failed syslog.openlog(str(module), 0, syslog.LOG_USER)