nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Raise an exception when unable to open datastore, instead of returning False

Browse Source
This commit is contained in:
nemunaire 2015-04-06 11:32:29 +02:00 committed by nemunaire
parent 1b9395ca37
commit 57bbca4e7a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
datas/datas
View File

22
nemubot/datastore/xml.py
View File

@ -29,18 +29,18 @@ class XML(Abstract):
def open(self): def open(self):
"""Lock the directory""" """Lock the directory"""
if os.path.isdir(self.basedir): if not os.path.isdir(self.basedir):
lock_file = os.path.join(self.basedir, ".used_by_nemubot") os.mkdir(self.basedir)
if not os.path.exists(lock_file):
with open(lock_file, 'w') as lf:
lf.write(str(os.getpid()))
return True
else: lock_file = os.path.join(self.basedir, ".used_by_nemubot")
with open(lock_file, 'r') as lf: if os.path.exists(lock_file):
pid = lf.readline() with open(lock_file, 'r') as lf:
raise Exception("Data dir already locked, by PID %s" % pid) pid = lf.readline()
return False raise Exception("Data dir already locked, by PID %s" % pid)
with open(lock_file, 'w') as lf:
lf.write(str(os.getpid()))
return True
def close(self): def close(self):
"""Release a locked path""" """Release a locked path"""