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

On n'utilise plus de locks, c'est gr au niveau de generate...

Browse source 
darcs-hash:20050422154444-d1718-0f49610b7858ec6d104e1411fdec723f3e3bb4a6.gz
This commit is contained in:
bernat 2005-04-22 17:44:44 +02:00
parent 0084764d78
commit 7e49046d6c
1 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gestion/wifi-update.py
View file

@ -52,7 +52,6 @@ sys.path.append('/usr/scripts/gestion')
# LDAP # LDAP
from ldap_crans import crans_ldap from ldap_crans import crans_ldap
from lock import *
# Divers # Divers
from iptools import AddrInNet from iptools import AddrInNet
@ -202,15 +201,8 @@ class UpdateFactory(protocol.ServerFactory):
def getSAD_lock(self, getre, delre, host): def getSAD_lock(self, getre, delre, host):
# ETAPE 2 # ETAPE 2
# On essaie d'obtenir le lock # Plus de lock pour le moment...
def delLockAndRaise(f): return getSAD_script(self, getre, delre, host))
remove_lock('gen_confs.wifi')
return f
d = wait_lock('gen_confs.wifi', 'locked by wifi-update')
d.addCallback(lambda _: getSAD_script(self, getre, delre, host))
d.addErrback(delLockAndRaise)
return d
def getSAD_script(self, getre, delre, host): def getSAD_script(self, getre, delre, host):
# ETAPE 3 # ETAPE 3
@ -230,7 +222,7 @@ class UpdateFactory(protocol.ServerFactory):
# Il ne devrait n'y en avoir qu'un, mais... # Il ne devrait n'y en avoir qu'un, mais...
for f in os.listdir('retry'): for f in os.listdir('retry'):
result = result + file('retry/%s' % f).read() result = result + file('retry/%s' % f).read()
remove_lock('gen_confs.wifi') # remove_lock('gen_confs.wifi')
return result return result
else: else:
# Il n'y a rien dans le répertoire retry # Il n'y a rien dans le répertoire retry
@ -255,7 +247,7 @@ class UpdateFactory(protocol.ServerFactory):
for f in delre: for f in delre:
os.remove(f) os.remove(f)
remove_lock('gen_confs.wifi') # remove_lock('gen_confs.wifi')
if len(result) > 5: if len(result) > 5:
print "We send the following script to %s :" % host print "We send the following script to %s :" % host
print result print result