[#3] Fix up some oddness

This commit is contained in:
Joshua Boniface 2018-06-25 23:17:04 -04:00
parent ac2b3c464c
commit c5a7ac0738
1 changed files with 3 additions and 3 deletions

View File

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