CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-07 01:32:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Put mysql import in try,catch in case it hasn't been installed

Browse Source
This commit is contained in:
William Wernert
2020-11-10 10:00:21 -05:00
parent dba30fb0ed
commit 22b7de819c
1 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
salt/_modules/so.py
View File

@@ -7,10 +7,15 @@ def status():
def mysql_conn(retry): def mysql_conn(retry):
from MySQLdb import _mysql
import time
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
try:
from MySQLdb import _mysql
except ImportError as e:
log.error(e)
return False
from time import sleep
mainint = __salt__['pillar.get']('sensor:mainint', __salt__['pillar.get']('manager:mainint')) mainint = __salt__['pillar.get']('sensor:mainint', __salt__['pillar.get']('manager:mainint'))
mainip = __salt__['grains.get']('ip_interfaces').get(mainint)[0] mainip = __salt__['grains.get']('ip_interfaces').get(mainint)[0]
@@ -30,7 +35,7 @@ def mysql_conn(retry):
except Exception as e: except Exception as e:
log.error(e) log.error(e)
break break
time.sleep(1) sleep(1)
if not mysql_up: if not mysql_up:
log.error(f'Could not connect to MySQL server on {mainip} after {retry} attempts.') log.error(f'Could not connect to MySQL server on {mainip} after {retry} attempts.')