crans/lc_ldap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ldap_locks, lc_ldap] Ooups, erreur d'index / d'iteration

Browse source
This commit is contained in:
Valentin Samir 2014-11-09 16:50:48 +01:00
parent 1b76ba5420
commit 294773ba6e
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ldap_locks.py
View file

@ -172,11 +172,12 @@ class LdapLockHolder:
def check(self, Id='default', delai=0):
"""Vérifie que l'on a toujours tous nos locks"""
for item, value in self.locks[Id]:
host, pid, begin = self.getlock(item, value)
time_left = self.timeout - (time.time() - begin)
if time_left <= delai:
raise LockExpired("Le lock sur la donnée %r=%r à expiré" % (item, value, time_left))
for item, values in self.locks[Id].items():
for value in values:
host, pid, begin = self.getlock(item, value)
time_left = self.timeout - (time.time() - begin)
if time_left <= delai:
raise LockExpired("Le lock sur la donnée %r=%r à expiré" % (item, value, time_left))
def removelock(self, item, value, Id='default', force=False):
"""
@ -207,6 +208,9 @@ class LdapLockHolder:
return host, int(pid), float(begin)
except ldap.NO_SUCH_OBJECT:
raise LockNotFound()
except ldap.INVALID_DN_SYNTAX:
print '%s=%s,%s' % (item, value, LOCKS_DN)
raise
except ValueError as e:
self.removelock(item, value, Id, force=True)
raise LockNotFound()