From ed0e9514b81d24ef73b5258fed53b83be0973332 Mon Sep 17 00:00:00 2001 From: pessoles Date: Tue, 29 Nov 2005 22:12:15 +0100 Subject: [PATCH] provisoire darcs-hash:20051129211215-6d78a-7ff2cc94660d5a2b2b3a53438316e4e10ab18ee5.gz --- surveillance/deconnexion.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/surveillance/deconnexion.py b/surveillance/deconnexion.py index 75d45787..9229a3c0 100755 --- a/surveillance/deconnexion.py +++ b/surveillance/deconnexion.py @@ -69,21 +69,24 @@ requete = "SELECT ip_crans,round(sum(upload)/1024/1024) AS total FROM upload WHE curseur.execute(requete) uploadeurs_dump = curseur.fetchall() -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) +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" +curseur.execute(requete) +uploadeurs = curseur.fetchall() - # Table des avertis +# Table des avertis ################### # Avertis hard