|
|
|
|
@ -306,6 +306,7 @@ def mysql_config_check():
|
|
|
|
|
sql.close()
|
|
|
|
|
else:
|
|
|
|
|
logger.debug('(MYSQL) problem connecting to SQL server, aborting')
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
for system in SQLCONFIG:
|
|
|
|
|
if system not in CONFIG['SYSTEMS']:
|
|
|
|
|
@ -1124,15 +1125,15 @@ if __name__ == '__main__':
|
|
|
|
|
logger.debug('(MYSQL) reading config from database')
|
|
|
|
|
try:
|
|
|
|
|
SQLCONFIG = sql.getConfig()
|
|
|
|
|
#Add MySQL config data to config dict
|
|
|
|
|
CONFIG['SYSTEMS'].update(SQLCONFIG)
|
|
|
|
|
sql.close()
|
|
|
|
|
except:
|
|
|
|
|
logger.debug('(MYSQL) problem with SQL query, aborting')
|
|
|
|
|
sql.close()
|
|
|
|
|
else:
|
|
|
|
|
logger.debug('(MYSQL) problem connecting to SQL server, aborting')
|
|
|
|
|
|
|
|
|
|
#Add MySQL config data to config dict
|
|
|
|
|
CONFIG['SYSTEMS'].update(SQLCONFIG)
|
|
|
|
|
sql.close()
|
|
|
|
|
|
|
|
|
|
# Set up the signal handler
|
|
|
|
|
def sig_handler(_signal, _frame):
|
|
|
|
|
|