wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adds more logging to ansible-connection (#20298)

Browse source 
* Server() instance will now add the entire traceback to syslog if it fail
  during init
This commit is contained in:
Peter Sprygada 2017-01-16 08:32:08 -05:00 committed by GitHub
parent cc75505d14
commit 312328e22c
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bin/ansible-connection
View file

@ -117,19 +117,16 @@ class Server():
self._start_time = datetime.datetime.now() self._start_time = datetime.datetime.now()
self.log('loading connection plugin %s' % str(play_context.connection))
self.conn = connection_loader.get(play_context.connection, play_context, sys.stdin)
try: try:
self.log('attempting to connect to remote host') self.log('loading connection plugin %s' % str(play_context.connection))
self.conn = connection_loader.get(play_context.connection, play_context, sys.stdin)
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(str(exc)) self.log(traceback.format_exc())
raise raise
signal.signal(signal.SIGALRM, self.alarm_handler) signal.signal(signal.SIGALRM, self.alarm_handler)
@ -223,9 +220,7 @@ class Server():
send_data(s, to_bytes(stderr)) send_data(s, to_bytes(stderr))
s.close() s.close()
except Exception as e: except Exception as e:
# FIXME: proper logging and error handling here log(traceback.format_exc())
log('runtime exception: %s' % e)
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