parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Finish up config handling and get rid of atexit

This commit is contained in:
Joshua Boniface 2018-06-16 22:38:25 -04:00
parent 313181f48f
commit cd73dc3a15
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pvcd.py
View File

@ -30,7 +30,6 @@ import psutil
import subprocess import subprocess
import uuid import uuid
import time import time
import atexit
import configparser import configparser
import apscheduler.schedulers.background import apscheduler.schedulers.background
@ -47,8 +46,6 @@ except:
print('ERROR: The "PVCD_CONFIG_FILE" environment variable must be set before starting pvcd.') print('ERROR: The "PVCD_CONFIG_FILE" environment variable must be set before starting pvcd.')
exit(1) exit(1)
print('Loading configuration from file {}'.format(pvcd_config_file))
myhostname = socket.gethostname() myhostname = socket.gethostname()
myshorthostname = myhostname.split('.', 1)[0] myshorthostname = myhostname.split('.', 1)[0]
mydomainname = ''.join(myhostname.split('.', 1)[1:]) mydomainname = ''.join(myhostname.split('.', 1)[1:])
@ -62,6 +59,8 @@ config_values = [
'ipmi_password' 'ipmi_password'
] ]
def readConfig(pvcd_config_file, myhostname): def readConfig(pvcd_config_file, myhostname):
print('Loading configuration from file {}'.format(pvcd_config_file))
o_config = configparser.ConfigParser() o_config = configparser.ConfigParser()
o_config.read(pvcd_config_file) o_config.read(pvcd_config_file)
config = {} config = {}
@ -91,7 +90,11 @@ def readConfig(pvcd_config_file, myhostname):
return config return config
config = readConfig(pvcd_config_file, myhostname) config = {}
def getConfig():
global config
config = readConfig(pvcd_config_file, myhostname)
# Connect to local zookeeper # Connect to local zookeeper
zk = kazoo.client.KazooClient(hosts=config['zookeeper']) zk = kazoo.client.KazooClient(hosts=config['zookeeper'])
@ -105,25 +108,25 @@ except:
def zk_listener(state): def zk_listener(state):
if state == kazoo.client.KazooState.LOST: if state == kazoo.client.KazooState.LOST:
cleanup() cleanup()
exit(1)
elif state == kazoo.client.KazooState.SUSPENDED: elif state == kazoo.client.KazooState.SUSPENDED:
cleanup() cleanup()
exit(1)
else: else:
pass pass
zk.add_listener(zk_listener) zk.add_listener(zk_listener)
@atexit.register
def cleanup(): def cleanup():
update_timer.shutdown() update_timer.shutdown()
zk.set('/nodes/{}/daemonstate'.format(myhostname), 'stop'.encode('ascii')) zk.set('/nodes/{}/daemonstate'.format(myhostname), 'stop'.encode('ascii'))
zk.stop() zk.stop()
zk.close() zk.close()
exit(0) sys.exit(0)
# Handle SIGTERM gracefully # Handle signals gracefully
signal.signal(signal.SIGTERM, cleanup) signal.signal(signal.SIGTERM, cleanup)
signal.signal(signal.SIGINT, cleanup)
signal.signal(signal.SIGQUIT, cleanup)
signal.signal(signal.SIGHUP, getConfig)
# Gather useful data about our host for staticdata # Gather useful data about our host for staticdata
# Static data format: 'cpu_count', 'arch', 'os', 'kernel' # Static data format: 'cpu_count', 'arch', 'os', 'kernel'