From 5775b3cf584f200c7c79748c7a377d4e78e2bc61 Mon Sep 17 00:00:00 2001 From: pessoles Date: Sun, 16 Oct 2005 12:53:01 +0200 Subject: [PATCH] En cas redeconnexion pour virus, on reedite les occurences existantes des motifs virus. darcs-hash:20051016105301-6d78a-2f3fe57f8e0f9e23e524527717b1798b43121eca.gz --- surveillance/deconnexion.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) 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()