From 4057c5cd859726a46c40e0417f7e65c3c60680f3 Mon Sep 17 00:00:00 2001 From: bashmak Date: Thu, 11 May 2017 13:10:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20=D0=B4=D0=BB=D1=8F=20=D1=81?= =?UTF-8?q?=D0=B1=D0=BE=D1=80=D0=B0=20=D1=82=D1=80=D0=B0=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=20ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- statistics/models.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/statistics/models.py b/statistics/models.py index 31d07d3..a782fc5 100644 --- a/statistics/models.py +++ b/statistics/models.py @@ -9,14 +9,16 @@ from .fields import UnixDateTimeField class StatManager(models.Manager): def traffic_by_ip(self, ip): - # ip = IPv4Address(ip) - traf = self.filter(ip=ip, octets__gt=524288)[0] - now = datetime.now() - if traf.cur_time < now - timedelta(minutes=5): - # значит трафа небыло больше 5 минут - return False, traf - else: - return True, traf + try: + traf = self.filter(ip=ip, octets__gt=524288)[0] + now = datetime.now() + if traf.cur_time < now - timedelta(minutes=55): + # значит трафа небыло больше 5 минут + return False, traf + else: + return True, traf + except IndexError: + return False, None class StatElem(models.Model):