internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

reverted need for module utils imports

Browse Source
This commit is contained in:
Brian Coca
2016-06-16 18:12:38 -04:00
committed by Matt Clay
parent 0c82db9cda
commit f595b27e47
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ansible/modules/utilities/logic/async_wrapper.py
View File

@@ -32,9 +32,6 @@ import signal
import time import time
import syslog import syslog
# Backwards compat. There were present in basic.py before
from ansible.module_utils.pycompat24 import get_exception
syslog.openlog('ansible-%s' % os.path.basename(__file__)) syslog.openlog('ansible-%s' % os.path.basename(__file__))
syslog.syslog(syslog.LOG_NOTICE, 'Invoked with %s' % " ".join(sys.argv[1:])) syslog.syslog(syslog.LOG_NOTICE, 'Invoked with %s' % " ".join(sys.argv[1:]))
@@ -49,7 +46,7 @@ def daemonize_self():
# exit first parent # exit first parent
sys.exit(0) sys.exit(0)
except OSError: except OSError:
e = get_exception() e = sys.exc_info()[1]
sys.exit("fork #1 failed: %d (%s)\n" % (e.errno, e.strerror)) sys.exit("fork #1 failed: %d (%s)\n" % (e.errno, e.strerror))
# decouple from parent environment # decouple from parent environment
@@ -64,7 +61,7 @@ def daemonize_self():
# print "Daemon PID %d" % pid # print "Daemon PID %d" % pid
sys.exit(0) sys.exit(0)
except OSError: except OSError:
e = get_exception() e = sys.exc_info()[1]
sys.exit("fork #2 failed: %d (%s)\n" % (e.errno, e.strerror)) sys.exit("fork #2 failed: %d (%s)\n" % (e.errno, e.strerror))
dev_null = file('/dev/null','rw') dev_null = file('/dev/null','rw')
@@ -90,7 +87,7 @@ def _run_module(wrapped_cmd, jid, job_path):
result = json.loads(outdata) result = json.loads(outdata)
except (OSError, IOError): except (OSError, IOError):
e = get_exception() e = sys.exc_info()[1]
result = { result = {
"failed": 1, "failed": 1,
"cmd" : wrapped_cmd, "cmd" : wrapped_cmd,