mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use threading locks instead of a boolean variable and busy loop

Browse Source
This commit is contained in:
Clint Armstrong
2015-09-14 13:38:46 -04:00
parent 3476724cad
commit 5e3d968ee9
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
poller-service.py
View File

@@ -53,14 +53,11 @@ class DB:
conn = None
def __init__(self):
self.in_use = False
self.in_use = threading.Lock()
self.connect()
def connect(self):
while self.in_use:
continue
self.in_use = True
self.in_use.acquire(True)
while True:
try:
self.conn.close()
@@ -79,24 +76,21 @@ class DB:
self.conn.autocommit(True)
self.conn.ping(True)
self.in_use = False
self.in_use.release()
def query(self, sql):
while self.in_use:
continue
self.in_use = True
self.in_use.acquire(True)
while True:
try:
cursor = self.conn.cursor()
cursor.execute(sql)
ret = cursor.fetchall()
cursor.close()
self.in_use = False
self.in_use.release()
return ret
except (AttributeError, MySQLdb.OperationalError):
log.warning('WARNING: MySQL Operational Error during query, reconnecting.')
self.in_use = False
self.in_use.release()
self.connect()
except (AttributeError, MySQLdb.ProgrammingError):
log.warning('WARNING: MySQL Programming Error during query, attempting query again.')