This commit is contained in:
Simon 2020-10-01 00:22:53 +01:00
parent 3e82d2ff91
commit 29e8b9519a

View File

@ -309,15 +309,18 @@ def mysql_config_check():
return return
for system in SQLCONFIG: for system in SQLCONFIG:
if system not in CONFIG['SYSTEMS'] and SQLCONFIG[system]['ENABLED'] == True: if system not in CONFIG['SYSTEMS']:
logger.debug('(MYSQL) new enabled system %s, starting HBP listener',system) if SQLCONFIG[system]['ENABLED'] == True:
CONFIG['SYSTEMS'][system] = SQLCONFIG[system] logger.debug('(MYSQL) new enabled system %s, starting HBP listener',system)
systems[system] = routerHBP(system, CONFIG, report_server) CONFIG['SYSTEMS'][system] = SQLCONFIG[system]
listeningPorts[system] = reactor.listenUDP(CONFIG['SYSTEMS'][system]['PORT'], systems[system], interface=CONFIG['SYSTEMS'][system]['IP']) systems[system] = routerHBP(system, CONFIG, report_server)
listeningPorts[system] = reactor.listenUDP(CONFIG['SYSTEMS'][system]['PORT'], systems[system], interface=CONFIG['SYSTEMS'][system]['IP'])
else:
logger.debug('(MYSQL) new disabled system %s',system)
#Do ACL processing #Do ACL processing
# Registration ACLs # Registration ACLs
#SQLCONFIG[system]['REG_ACL'] = acl_build(SQLCONFIG[system]['REG_ACL'], PEER_MAX) #SQLCONFIG[system]['REG_ACL'] = acl_build(SQLCONFIG[system]['REG_ACL'], PEER_MAX)
# Subscriber and TGID ACLs # Subscriber and TGID ACLs
logger.debug('(MYSQL) building ACLs') logger.debug('(MYSQL) building ACLs')
for acl in ['SUB_ACL', 'TG1_ACL', 'TG2_ACL']: for acl in ['SUB_ACL', 'TG1_ACL', 'TG2_ACL']:
SQLCONFIG[system][acl] = acl_build(SQLCONFIG[system][acl], ID_MAX) SQLCONFIG[system][acl] = acl_build(SQLCONFIG[system][acl], ID_MAX)