ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

adds some more logging to ansible-connection (#20205)

Browse source
This commit is contained in:
Peter Sprygada 2017-01-12 19:20:25 -05:00 committed by GitHub
parent 0ffacedb3e
commit 3f949358c7
1 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
bin/ansible-connection
View file

@ -19,9 +19,10 @@
######################################################## ########################################################
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
__metaclass__ = type
__requires__ = ['ansible'] __requires__ = ['ansible']
try: try:
import pkg_resources import pkg_resources
except Exception: except Exception:
@ -100,6 +101,13 @@ def recv_data(s):
data += d data += d
return data return data
def log(msg, host=None):
if host:
msg = '[%s] %s' % (host, msg)
facility = getattr(syslog, C.DEFAULT_SYSLOG_FACILITY, syslog.LOG_USER)
syslog.openlog('ansible-connection', 0, facility)
syslog.syslog(syslog.LOG_INFO, str(msg))
class Server(): class Server():
@ -109,37 +117,31 @@ class Server():
self._start_time = datetime.datetime.now() self._start_time = datetime.datetime.now()
try:
# FIXME: the connection loader here is created brand new,
# so it will not see any custom paths loaded (ie. via
# roles), so we will need to serialize the connection
# loader and send it over as we do the PlayContext
# in the main() method below.
self.log('loading connection plugin %s' % str(play_context.connection)) self.log('loading connection plugin %s' % str(play_context.connection))
self.conn = connection_loader.get(play_context.connection, play_context, sys.stdin) self.conn = connection_loader.get(play_context.connection, play_context, sys.stdin)
try:
self.log('attempting to connect to remote host')
self.conn._connect() self.conn._connect()
self.log('successfully connected, starting listener')
self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
self.socket.bind(path) self.socket.bind(path)
self.socket.listen(1) self.socket.listen(1)
except Exception as exc: except Exception as exc:
self.log(exc) self.log(str(exc))
return raise
signal.signal(signal.SIGALRM, self.alarm_handler) signal.signal(signal.SIGALRM, self.alarm_handler)
def log(self, msg):
syslog_msg = '[%s] %s' % (self.play_context.remote_addr, msg)
facility = getattr(syslog, C.DEFAULT_SYSLOG_FACILITY, syslog.LOG_USER)
syslog.openlog('ansible-connection', 0, facility)
syslog.syslog(syslog.LOG_INFO, syslog_msg)
def dispatch(self, obj, name, *args, **kwargs): def dispatch(self, obj, name, *args, **kwargs):
meth = getattr(obj, name, None) meth = getattr(obj, name, None)
if meth: if meth:
return meth(*args, **kwargs) return meth(*args, **kwargs)
def log(self, msg):
log(msg, self.play_context.remote_addr)
def alarm_handler(self, signum, frame): def alarm_handler(self, signum, frame):
''' '''
Alarm handler Alarm handler
@ -222,14 +224,14 @@ class Server():
s.close() s.close()
except Exception as e: except Exception as e:
# FIXME: proper logging and error handling here # FIXME: proper logging and error handling here
self.log('runtime exception: %s' % e) log('runtime exception: %s' % e)
print(traceback.format_exc()) print(traceback.format_exc())
finally: finally:
# when done, close the connection properly and cleanup # when done, close the connection properly and cleanup
# the socket file so it can be recreated # the socket file so it can be recreated
end_time = datetime.datetime.now() end_time = datetime.datetime.now()
delta = end_time - self._start_time delta = end_time - self._start_time
self.log('shutting down connection, connection was active for %s secs' % delta) log('shutting down connection, connection was active for %s secs' % delta, self.play_context.remote_addr)
try: try:
self.conn.close() self.conn.close()
self.socket.close() self.socket.close()
@ -238,6 +240,7 @@ class Server():
os.remove(self.path) os.remove(self.path)
def main(): def main():
try: try:
# read the play context data via stdin, which means depickling it # read the play context data via stdin, which means depickling it
# FIXME: as noted above, we will probably need to deserialize the # FIXME: as noted above, we will probably need to deserialize the
@ -252,7 +255,6 @@ def main():
cur_line = sys.stdin.readline() cur_line = sys.stdin.readline()
src = BytesIO(to_bytes(init_data)) src = BytesIO(to_bytes(init_data))
pc_data = cPickle.load(src) pc_data = cPickle.load(src)
#src.close()
pc = PlayContext() pc = PlayContext()
pc.deserialize(pc_data) pc.deserialize(pc_data)
@ -312,13 +314,12 @@ def main():
time.sleep(C.PERSISTENT_CONNECT_INTERVAL) time.sleep(C.PERSISTENT_CONNECT_INTERVAL)
attempts += 1 attempts += 1
if attempts > C.PERSISTENT_CONNECT_RETRIES: if attempts > C.PERSISTENT_CONNECT_RETRIES:
sys.stderr.write("failed to connect to the host, connection timeout") sys.stderr.write('failed to connect to the listener socket, '
'connection timeout. See syslog for more details')
sys.exit(255) sys.exit(255)
#
# send the play_context back into the connection so the connection # send the play_context back into the connection so the connection
# can handle any privilege escalation or deescalation activities # can handle any privilege escalation activities
#
pc_data = 'CONTEXT: %s' % src.getvalue() pc_data = 'CONTEXT: %s' % src.getvalue()
send_data(sf, to_bytes(pc_data)) send_data(sf, to_bytes(pc_data))
src.close() src.close()