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

SQL fix error logic

Browse Source
This commit is contained in:
Simon 2020-09-30 20:56:07 +01:00
parent e31427879a
commit 28ac8f9734
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bridge_master.py
View File

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