ShaYmez/RYSEN
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check master maintenance loop is running before we try and stop it to avoid exception

Browse Source
This commit is contained in:
Simon 2020-11-07 16:01:41 +00:00
parent a1bf50e698
commit bdad00ffdc
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bridge_master.py
View File

@ -595,7 +595,9 @@ def mysql_config_check():
if SQLCONFIG[system]['ENABLED'] == False and CONFIG['SYSTEMS'][system]['ENABLED'] == True: if SQLCONFIG[system]['ENABLED'] == False and CONFIG['SYSTEMS'][system]['ENABLED'] == True:
logger.debug('(MYSQL) %s changed from enabled to disabled, killing HBP listener and removing from bridges',system) logger.debug('(MYSQL) %s changed from enabled to disabled, killing HBP listener and removing from bridges',system)
systems[system].master_dereg() systems[system].master_dereg()
systems[system]._system_maintenance.stop() if systems[system]._system_maintenance is not None:
systems[system]._system_maintenance.stop()
systems[system]._system_maintenance = None
remove_bridge_system(system) remove_bridge_system(system)
listeningPorts[system].stopListening() listeningPorts[system].stopListening()
@ -650,7 +652,9 @@ def mysql_config_check():
if SQLCONFIG[system]['DEFAULT_UA_TIMER'] != CONFIG['SYSTEMS'][system]['DEFAULT_UA_TIMER']: if SQLCONFIG[system]['DEFAULT_UA_TIMER'] != CONFIG['SYSTEMS'][system]['DEFAULT_UA_TIMER']:
logger.debug('(MYSQL) %s DEFAULT_UA_TIMER changed. Killing HBP listener. Will restart in 1 minute',system) logger.debug('(MYSQL) %s DEFAULT_UA_TIMER changed. Killing HBP listener. Will restart in 1 minute',system)
systems[system].master_dereg() systems[system].master_dereg()
systems[system]._system_maintenance.stop() if systems[system]._system_maintenance is not None:
systems[system]._system_maintenance.stop()
systems[system]._system_maintenance = None
remove_bridge_system(system) remove_bridge_system(system)
listeningPorts[system].stopListening() listeningPorts[system].stopListening()
SQLCONFIG[system]['ENABLED'] = False SQLCONFIG[system]['ENABLED'] = False
@ -658,21 +662,27 @@ def mysql_config_check():
if SQLCONFIG[system]['IP'] != CONFIG['SYSTEMS'][system]['IP'] and CONFIG['SYSTEMS'][system]['ENABLED'] == True: if SQLCONFIG[system]['IP'] != CONFIG['SYSTEMS'][system]['IP'] and CONFIG['SYSTEMS'][system]['ENABLED'] == True:
logger.debug('(MYSQL) %s IP binding changed on enabled system, killing HBP listener. Will restart in 1 minute',system) logger.debug('(MYSQL) %s IP binding changed on enabled system, killing HBP listener. Will restart in 1 minute',system)
systems[system].master_dereg() systems[system].master_dereg()
systems[system]._system_maintenance.stop() if systems[system]._system_maintenance is not None:
systems[system]._system_maintenance.stop()
systems[system]._system_maintenance = None
listeningPorts[system].stopListening() listeningPorts[system].stopListening()
SQLCONFIG[system]['ENABLED'] = False SQLCONFIG[system]['ENABLED'] = False
if SQLCONFIG[system]['PORT'] != CONFIG['SYSTEMS'][system]['PORT'] and CONFIG['SYSTEMS'][system]['ENABLED'] == True: if SQLCONFIG[system]['PORT'] != CONFIG['SYSTEMS'][system]['PORT'] and CONFIG['SYSTEMS'][system]['ENABLED'] == True:
logger.debug('(MYSQL) %s Port binding changed on enabled system, killing HBP listener. Will restart in 1 minute',system) logger.debug('(MYSQL) %s Port binding changed on enabled system, killing HBP listener. Will restart in 1 minute',system)
systems[system].master_dereg() systems[system].master_dereg()
systems[system]._system_maintenance.stop() if systems[system]._system_maintenance is not None:
systems[system]._system_maintenance.stop()
systems[system]._system_maintenance = None
listeningPorts[system].stopListening() listeningPorts[system].stopListening()
SQLCONFIG[system]['ENABLED'] = False SQLCONFIG[system]['ENABLED'] = False
if SQLCONFIG[system]['MAX_PEERS'] != CONFIG['SYSTEMS'][system]['MAX_PEERS'] and CONFIG['SYSTEMS'][system]['ENABLED'] == True: if SQLCONFIG[system]['MAX_PEERS'] != CONFIG['SYSTEMS'][system]['MAX_PEERS'] and CONFIG['SYSTEMS'][system]['ENABLED'] == True:
logger.debug('(MYSQL) %s MAX_PEERS changed on enabled system, killing HBP listener. Will restart in 1 minute',system) logger.debug('(MYSQL) %s MAX_PEERS changed on enabled system, killing HBP listener. Will restart in 1 minute',system)
systems[system].master_dereg() systems[system].master_dereg()
systems[system]._system_maintenance.stop() if systems[system]._system_maintenance is not None:
systems[system]._system_maintenance.stop()
systems[system]._system_maintenance = None
listeningPorts[system].stopListening() listeningPorts[system].stopListening()
SQLCONFIG[system]['ENABLED'] = False SQLCONFIG[system]['ENABLED'] = False