diff --git a/surveillance/deconnexion.py b/surveillance/deconnexion.py index cab9e406..5607b07c 100755 --- a/surveillance/deconnexion.py +++ b/surveillance/deconnexion.py @@ -191,17 +191,27 @@ if veroles: # Blacklistage for ligne in bl: # On réédite si possible les lignes existantes pour ne pas charger la blackliste - if ',virus,' in ligne : + if 'virus,' in ligne : + print ligne liste=ligne.split(',') - argument=['now','-',virus,hostname] + date = time() + debut = localtime(date) + argument=['now','-','virus',hostname] + print argument index = bl.index(ligne) + print index proprio.blacklist((index,argument)) proprio.save() + break else : date = time() debut = localtime(date) proprio.blacklist(["%d/%d/%d %d:%d" % (debut[2],debut[1],debut[0],debut[3],debut[4]),'-','virus',hostname]) proprio.save() + #date = time() + #debut = localtime(date) + #proprio.blacklist(["%d/%d/%d %d:%d" % (debut[2],debut[1],debut[0],debut[3],debut[4]),'-','virus',hostname]) + #proprio.save() # Flood @@ -240,7 +250,7 @@ if veroles: # Blacklistage date = time() debut = localtime(date) - proprio.blacklist(["%d/%d/%d %d:%d" % (debut[2],debut[1],debut[0],debut[3],debut[4]),'-','virus',hostname) + proprio.blacklist(["%d/%d/%d %d:%d" % (debut[2],debut[1],debut[0],debut[3],debut[4]),'-','virus',hostname]) proprio.save()