diff --git a/pvcd.py b/pvcd.py index 9caad55b..25684dc3 100755 --- a/pvcd.py +++ b/pvcd.py @@ -153,27 +153,10 @@ def cleanup(signum, frame): # Exit sys.exit(0) -# Flush function -def flush(): - this_node = t_node[myhostname] - this_node.flush() - -# Shutdown function -def dshutdown(): - ansiiprint.echo('Flushing this node', '', 'e') - flush() - ansiiprint.echo('NOTE: This node must be unflushed by the administrator after daemon startup', '', 'i') - cleanup() - -# Reload shutdown function -def dreload(): - cleanup() - # Handle signals gracefully -signal.signal(signal.SIGTERM, dshutdown) -signal.signal(signal.SIGINT, dshutdown) -signal.signal(signal.SIGQUIT, dshutdown) -signal.signal(signal.SIGHUP, dreload) +signal.signal(signal.SIGTERM, cleanup) +signal.signal(signal.SIGINT, cleanup) +signal.signal(signal.SIGQUIT, cleanup) # Gather useful data about our host for staticdata # Static data format: 'cpu_count', 'arch', 'os', 'kernel' diff --git a/pvcd.service b/pvcd.service index ef36e8cc..ffe834f3 100644 --- a/pvcd.service +++ b/pvcd.service @@ -9,7 +9,6 @@ WorkingDirectory = /usr/share/pvc Environment = PYTHONUNBUFFERED=true Environment = PVCD_CONFIG_FILE=/etc/pvc/pvcd.conf ExecStart = /usr/share/pvc/pvcd.py -ExecReload = /bin/kill -HUP $MAINPID Restart = on-failure [Install]