From 28ac8f97341a319b07e9ab3ad5bb658659862392 Mon Sep 17 00:00:00 2001
From: Simon <simon@adlem.net>
Date: Wed, 30 Sep 2020 20:56:07 +0100
Subject: [PATCH] SQL fix error logic

---
 bridge_master.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bridge_master.py b/bridge_master.py
index 870a06a..56c1a8c 100755
--- a/bridge_master.py
+++ b/bridge_master.py
@@ -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']:
@@ -317,7 +318,7 @@ def mysql_config_check():
             # Registration ACLs
             #SQLCONFIG[system]['REG_ACL'] = acl_build(SQLCONFIG[system]['REG_ACL'], PEER_MAX)
            # Subscriber and TGID ACLs
-           logger.debug('(MYSQL) building ACLs')
+            logger.debug('(MYSQL) building ACLs')
             for acl in ['SUB_ACL', 'TG1_ACL', 'TG2_ACL']:
                 SQLCONFIG[system][acl] = acl_build(SQLCONFIG[system][acl], ID_MAX)
             #Add system to bridges
@@ -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):