Revert "[#3] Fix up some oddness"

This reverts commit c5a7ac0738.
This commit is contained in:
Joshua Boniface 2018-06-26 12:10:15 -04:00
parent c5a7ac0738
commit 9eb1855add
1 changed files with 3 additions and 3 deletions

View File

@ -143,7 +143,7 @@ zk_conn.add_listener(zk_listener)
# Cleanup function
def cleanup():
ansiiprint.echo('Clearing daemon', '', 'w')
ansiiprint.echo('Terminating daemon', '', 'e')
# Set stop state in Zookeeper
zk_conn.set('/nodes/{}/daemonstate'.format(myhostname), 'stop'.encode('ascii'))
# Close the Zookeeper connection
@ -158,7 +158,7 @@ def flush():
# Shutdown function
def dshutdown(signum, frame):
ansiiprint.echo('Flushing this node', '', 'w')
ansiiprint.echo('Flushing this node', '', 'e')
flush()
ansiiprint.echo('NOTE: This node must be unflushed by the administrator after daemon startup', '', 'i')
cleanup()
@ -168,7 +168,7 @@ def dshutdown(signum, frame):
def dreload(signum, frame):
cleanup()
python = sys.executable
os.exec(python, python, *sys.argv)
os.execl(python, python, *sys.argv)
# Handle signals gracefully
signal.signal(signal.SIGTERM, dshutdown)