From 8d02a5c824bf000771c18e7a0a2ae6eabc27bbb5 Mon Sep 17 00:00:00 2001 From: bashmak Date: Thu, 11 May 2017 13:26:01 +0300 Subject: [PATCH 1/4] =?UTF-8?q?FIXBUG:=20=D0=BD=D0=B5=20=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE=20=D1=84=D0=B8=D0=BB=D1=8C?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B2=D0=B0=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- statistics/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/statistics/models.py b/statistics/models.py index a782fc5..0dda02d 100644 --- a/statistics/models.py +++ b/statistics/models.py @@ -10,7 +10,7 @@ class StatManager(models.Manager): def traffic_by_ip(self, ip): try: - traf = self.filter(ip=ip, octets__gt=524288)[0] + traf = self.order_by('-cur_time').filter(ip=ip)[0] now = datetime.now() if traf.cur_time < now - timedelta(minutes=55): # значит трафа небыло больше 5 минут From 87e54c8123ddb1e0cdc783b16660137da372bc5c Mon Sep 17 00:00:00 2001 From: bashmak Date: Thu, 11 May 2017 13:46:36 +0300 Subject: [PATCH 2/4] =?UTF-8?q?super=20=D0=B2=20=D1=81=D1=82=D0=B0=D1=80?= =?UTF-8?q?=D0=BE=D0=BC=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mydefs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mydefs.py b/mydefs.py index d71bfaf..56f0e9f 100644 --- a/mydefs.py +++ b/mydefs.py @@ -75,12 +75,12 @@ class MyGenericIPAddressField(models.GenericIPAddressField): description = "Int32 notation ip address" def __init__(self, protocol='ipv4', *args, **kwargs): - super().__init__(protocol=protocol, *args, **kwargs) + super(MyGenericIPAddressField, self).__init__(protocol=protocol, *args, **kwargs) self.max_length = 8 def get_prep_value(self, value): # strIp to Int - value = super().get_prep_value(value) + value = super(MyGenericIPAddressField, self).get_prep_value(value) return ip2int(value) def to_python(self, addr): From 8fca276d99be8973784c49f6e2a3f1273992c4c8 Mon Sep 17 00:00:00 2001 From: bashmak Date: Thu, 11 May 2017 13:47:29 +0300 Subject: [PATCH 3/4] =?UTF-8?q?FIXBUG:=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D0=B8=D0=BC=20=D0=B2=D0=B5=D1=81=D1=8C=20=D1=82=D1=80=D0=B0?= =?UTF-8?q?=D1=84=D0=B8=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abonapp/views.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/abonapp/views.py b/abonapp/views.py index b6218f9..9dcb102 100644 --- a/abonapp/views.py +++ b/abonapp/views.py @@ -725,11 +725,10 @@ def charts(request, gid, uid): if abon.ip_address is None: charts_data = None else: - charts_data = StatElem.objects.filter(ip=abon.ip_address.ip) - oct_limit = StatElem.percentile([cd.octets for cd in charts_data], 0.01) + charts_data = StatElem.objects.filter(ip=abon.ip_address) + #oct_limit = StatElem.percentile([cd.octets for cd in charts_data], 0.05) # ниже возвращаем пары значений трафика который переведён в mByte, и unix timestamp - charts_data = ["{x:%d,y:%.4f}" % (cd.cur_time.timestamp(), byte_to_mbit(cd.octets)) for cd in charts_data if - cd.octets < oct_limit] + charts_data = ["{x:%d,y:%.4f}" % (cd.cur_time.timestamp(), byte_to_mbit(cd.octets)) for cd in charts_data] except models.Abon.DoesNotExist: messages.error(request, _('Abon does not exist')) From 0f00f9e0fe1a8dc808da5a89a7b55168970acaff Mon Sep 17 00:00:00 2001 From: http Date: Thu, 11 May 2017 18:04:53 +0300 Subject: [PATCH 4/4] show traf more than 512Kb --- statistics/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/statistics/models.py b/statistics/models.py index 0dda02d..f0ab566 100644 --- a/statistics/models.py +++ b/statistics/models.py @@ -10,7 +10,7 @@ class StatManager(models.Manager): def traffic_by_ip(self, ip): try: - traf = self.order_by('-cur_time').filter(ip=ip)[0] + traf = self.order_by('-cur_time').filter(ip=ip, octets__gt=524288)[0] now = datetime.now() if traf.cur_time < now - timedelta(minutes=55): # значит трафа небыло больше 5 минут