diff options
| author | Seth Vidal <skvidal@fedoraproject.org> | 2013-07-04 13:50:34 -0400 |
|---|---|---|
| committer | Seth Vidal <skvidal@fedoraproject.org> | 2013-07-04 13:50:34 -0400 |
| commit | 4ea5bc2a425d85d90f36c4318949f7c64f6fcd73 (patch) | |
| tree | 39b5b768c974b08dbf8238a5a9fbc23536484b62 /callback_plugins | |
| parent | eacf95cf4638a11ec0c7db9c4d4374bef1dd6215 (diff) | |
| download | ansible-4ea5bc2a425d85d90f36c4318949f7c64f6fcd73.tar.gz ansible-4ea5bc2a425d85d90f36c4318949f7c64f6fcd73.tar.xz ansible-4ea5bc2a425d85d90f36c4318949f7c64f6fcd73.zip | |
add patch from jp mens to fix os.getlogin() when running w/o a tty :)
Diffstat (limited to 'callback_plugins')
| -rw-r--r-- | callback_plugins/logdetail.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/callback_plugins/logdetail.py b/callback_plugins/logdetail.py index 3f0866735..1433ef7f4 100644 --- a/callback_plugins/logdetail.py +++ b/callback_plugins/logdetail.py @@ -18,6 +18,7 @@ import os import time import json +import pwd from ansible import utils TIME_FORMAT="%b %d %Y %H:%M:%S" @@ -26,6 +27,8 @@ MSG_FORMAT="%(now)s\t%(count)s\t%(category)s\t%(name)s\t%(data)s\n" LOG_PATH = '/var/log/ansible' +def getlogin(): + return pwd.getpwuid(os.geteuid())[0] class LogMech(object): def __init__(self): @@ -84,7 +87,7 @@ class LogMech(object): res['task_module'] = task.module_name res['task_args'] = task.module_args if self.playbook_id == 'ansible-cmd': - res['task_userid'] = os.getlogin() + res['task_userid'] = getlogin() for k in ("delegate_to", "environment", "first_available_file", "local_action", "notified_by", "notify", "only_if", "register", "sudo", "sudo_user", "tags", @@ -119,7 +122,7 @@ class LogMech(object): data['task_start'] = self._last_task_start data['task_end'] = time.time() data.update(self.task_to_json(task)) - data['task_userid'] = os.getlogin() + data['task_userid'] = getlogin() if category == 'OK' and data.get('changed', False): category = 'CHANGED' @@ -242,7 +245,7 @@ class CallbackModule(object): pb_info = {} pb_info['playbook_start'] = time.time() pb_info['playbook'] = path - pb_info['userid'] = os.getlogin() + pb_info['userid'] = getlogin() pb_info['extra_vars'] = play.playbook.extra_vars pb_info['inventory'] = play.playbook.inventory.host_list pb_info['playbook_checksum'] = utils.md5(path) |