deathbybandaid/SpiceBot-migrated
1
0
Fork 0
mirror of https://github.com/SpiceBot/SpiceBot.git synced 2026-11-13 15:09:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #55 from deathbybandaid/development

Browse Source 
better lock
This commit is contained in:
Deathbybandaid 2019-06-08 10:48:31 -04:00 committed by GitHub
commit 3de50fc5aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sopel_modules/SpiceBot/Database.py
View File

@ -85,8 +85,8 @@ class SpiceDB(object):
not already exist""" not already exist"""
session = self.ssession() session = self.ssession()
slug = nick.lower() slug = nick.lower()
self.nick_id_lock.acquire()
try: try:
self.nick_id_lock.acquire()
nickname = session.query(Nicknames) \ nickname = session.query(Nicknames) \
.filter(Nicknames.slug == slug) \ .filter(Nicknames.slug == slug) \
.one_or_none() .one_or_none()
@ -107,11 +107,9 @@ class SpiceDB(object):
self.nick_id_lock.release() self.nick_id_lock.release()
return nickname.nick_id return nickname.nick_id
except SQLAlchemyError: except SQLAlchemyError:
self.nick_id_lock.release()
session.rollback() session.rollback()
raise raise
finally: finally:
self.nick_id_lock.release()
session.close() session.close()
def set_nick_value(self, nick, key, value, namespace='default'): def set_nick_value(self, nick, key, value, namespace='default'):