[comptage_upload] Maintenant, ça marche, modulo analyse.py

* Je ferai un truc mieux demain.
This commit is contained in:
Pierre-Elliott Bécue 2014-06-18 01:39:10 +02:00
parent 615fac78ac
commit dfa71ba8f6
2 changed files with 4 additions and 10 deletions

View file

@ -99,11 +99,6 @@ def stats(ip_crans=[], ip_ext=[],
AND (date > timestamp 'now' - interval '%(begin_time)d hours')
AND (date < timestamp 'now' - interval '%(end_time)d hours')
GROUP BY %(show)s
) UNION (
SELECT %(select)s FROM upload6 WHERE (%(ip_crans)s) AND (%(ip_ext)s)
AND (date > timestamp 'now' - interval '%(begin_time)d hours')
AND (date < timestamp 'now' - interval '%(end_time)d hours')
GROUP BY %(show)s
)
) AS resultat_intemediaire
WHERE %(sort_by)s >= '%(sort_mini)d'
@ -174,7 +169,6 @@ def stats(ip_crans=[], ip_ext=[],
def stats_fork(stub='', ip_crans=[],
show=['ip_crans', 'ip_ext', 'port_crans', 'port_ext'],
upload_mini=0, show_limit=10, begin_time=24, end_time=0,
show_download=False,resolve_dns=False):
if '/' in stub: