From 04a7f54889dc2068049c3a176c61a3d0a0112795 Mon Sep 17 00:00:00 2001 From: pessoles Date: Tue, 29 Nov 2005 22:08:41 +0100 Subject: [PATCH] A suivre... darcs-hash:20051129210841-6d78a-e827d6bc0789fca58a079e737f820aa2d09484ed.gz --- surveillance/deconnexion.py | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/surveillance/deconnexion.py b/surveillance/deconnexion.py index 346e7528..75d45787 100755 --- a/surveillance/deconnexion.py +++ b/surveillance/deconnexion.py @@ -65,14 +65,25 @@ ldap = crans_ldap() # Vérification de l'upload et du download # ########################################### - -# Table des uploaders : -####################### -requete = "SELECT round(sum(upload)/1024/1024) AS total,ip_crans FROM upload WHERE upload>download AND date>timestamp 'now' - interval '1 day' AND date<'now' AND NOT EXISTS ( SELECT 1 FROM exemptes WHERE upload.ip_crans<<=exemptes.ip_crans and upload.ip_ext<<=exemptes.ip_dest) GROUP BY ip_crans ORDER BY total desc" +requete = "SELECT ip_crans,round(sum(upload)/1024/1024) AS total FROM upload WHERE upload>download AND date>timestamp 'now' - interval '1 day' AND date<'now' AND NOT EXISTS ( SELECT 1 FROM exemptes WHERE upload.ip_crans<<=exemptes.ip_crans and upload.ip_ext<<=exemptes.ip_dest) GROUP BY ip_crans ORDER BY total desc" curseur.execute(requete) -uploadeurs= curseur.fetchall() +uploadeurs_dump = curseur.fetchall() -# Table des avertis +uploadeurs = uploadeurs_dump + +requete = "SELECT ip_crans,round(sum(upload)/1024/1024) AS total FROM dump WHERE upload>download AND NOT EXISTS ( SELECT 1 FROM exemptes WHERE upload.ip_crans<<=exemptes.ip_crans and upload.ip_ext<<=exemptes.ip_dest) GROUP BY ip_crans ORDER BY total desc" +curseur.execute(requete) +uploadeurs_dump += curseur.fetchall() +uploadeurs_dump.sort() + + +#for i in range(0,len(uploadeurs_dump)-1): +# if uploadeurs_dump[i][0]==uploadeurs_dump[i+1][0]: +# uploadeurs_dump[i][1]=uploadeurs_dump[i][1]+uploadeurs_dump[i+1][1] +# uploadeurs_dump.pop(i+1) + + + # Table des avertis ################### # Avertis hard @@ -359,6 +370,4 @@ for ip, id_p2p, nombre in fraudeurs : # fermeture des connections mail.quit() -# On vide la base de dump -requete="DELETE FROM dump" -curseur.execute(requete) +