crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[analyse.py,statistiques.py] L'upload en ipv6 n'est plus dans la même table que pour l'ipv4

Browse source
This commit is contained in:
Valentin Samir 2013-02-13 15:16:33 +01:00
parent d735b21bb9
commit ee66f742f5
2 changed files with 59 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
surveillance/analyse.py
View file

@ -94,11 +94,18 @@ def stats(ip_crans=[], ip_ext=[],
requete = """
SELECT * FROM (
SELECT %(select)s FROM upload 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
(
SELECT %(select)s FROM upload 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
) 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'
ORDER BY %(sort_by)s DESC
LIMIT %(show_limit)d;""" % {