From d7d75451502125de035808380fa4692b56c97c47 Mon Sep 17 00:00:00 2001 From: glondu Date: Wed, 29 Aug 2007 19:20:32 +0200 Subject: [PATCH] On affiche vraiment l'upload exempt. darcs-hash:20070829172032-68412-3b47754aacab7d3a3f7e97fef300c609b174474f.gz --- surveillance/statistiques.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/surveillance/statistiques.py b/surveillance/statistiques.py index 63622edd..49568ee0 100755 --- a/surveillance/statistiques.py +++ b/surveillance/statistiques.py @@ -80,7 +80,19 @@ liste_upload = tableau(data = [ (l[1], l[2], gethostname(str(l[0]))) # Traffic exempté : ################### -requete = "SELECT ip_crans,sum(upload) AS somme , sum(download) FROM upload WHERE ip_crans IN ( SELECT ip_crans from exemptes) and date > timestamp 'now' - interval '1 day' GROUP BY ip_crans ORDER BY somme DESC" +requete = """SELECT ip_crans, sum(upload) AS somme, sum(download) +FROM upload +WHERE + date > timestamp 'now' - interval '1 day' + AND 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 somme DESC""" curseur.execute(requete) liste_exemptes = tableau(data = [ [l[1], l[2], gethostname(str(l[0])) ] for l in curseur.fetchall() ], titre = ['upload', 'download', 'machine'],