Added MariaDB connection timout
* Prevents waiting 1-2 minutes for it to fail if the server can't be reached * Connection attempt is made once per _connect() call
This commit is contained in:
parent
cf75348c2c
commit
8a4c2c059c
1 changed files with 13 additions and 20 deletions
|
|
@ -52,8 +52,6 @@ class osTicket(): # pylint: disable=invalid-name
|
|||
return
|
||||
|
||||
# Connect to database
|
||||
for i in range(3):
|
||||
i += 1
|
||||
try:
|
||||
self.db_connection = mariadb.connect(
|
||||
host=SQL['Host'],
|
||||
|
|
@ -61,17 +59,12 @@ class osTicket(): # pylint: disable=invalid-name
|
|||
database=SQL['DB'],
|
||||
user=SQL['User'],
|
||||
password=SQL['Pass'],
|
||||
connection_timeout=5,
|
||||
)
|
||||
self.db_cursor = self.db_connection.cursor()
|
||||
except mariadb.errors.InterfaceError:
|
||||
# Network issue? try again
|
||||
std.sleep(2)
|
||||
except mariadb.errors.Error:
|
||||
# Bad creds or other SQL error, bail
|
||||
break
|
||||
else:
|
||||
# Connection established
|
||||
break
|
||||
# Assuming network issue or bad creds
|
||||
pass
|
||||
|
||||
# Raise exception if necessary
|
||||
if self.db_cursor is None:
|
||||
|
|
|
|||
Loading…
Reference in a new issue