diff --git a/main/views.py b/main/views.py index 4d1e401..86d258d 100755 --- a/main/views.py +++ b/main/views.py @@ -8,10 +8,11 @@ from django.http import HttpResponseRedirect, HttpResponse from django.template import RequestContext from django.utils.translation import ugettext_lazy as _ from django.utils import simplejson -from pydash.settings import TIME_JS_REFRESH, TIME_JS_REFRESH_LONG +from pydash.settings import TIME_JS_REFRESH, TIME_JS_REFRESH_LONG, TIME_JS_REFRESH_NET time_refresh = TIME_JS_REFRESH time_refresh_long = TIME_JS_REFRESH_LONG +time_refresh_net = TIME_JS_REFRESH_NET def index(request): """ @@ -239,5 +240,6 @@ def getall(request): #'getusers': get_users(), 'getcpuusage': get_cpu_usage(), 'time_refresh': time_refresh, - 'time_refresh_long': time_refresh_long + 'time_refresh_long': time_refresh_long, + 'time_refresh_net': time_refresh_net }, context_instance=RequestContext(request)) diff --git a/pydash/settings.py b/pydash/settings.py index 6c244b2..eaac0cd 100644 --- a/pydash/settings.py +++ b/pydash/settings.py @@ -32,6 +32,7 @@ MANAGERS = ADMINS TIME_JS_REFRESH = 30000 TIME_JS_REFRESH_LONG = 120000 +TIME_JS_REFRESH_NET = 2000 ALLOWED_HOSTS = ['*'] diff --git a/templates/main.html b/templates/main.html index 82e0d7b..bdc8e08 100644 --- a/templates/main.html +++ b/templates/main.html @@ -382,7 +382,7 @@ var load_ctx = $("#loadChart").get(0).getContext("2d"); window.setInterval('dashboard.getDisk()', {{ time_refresh_long }}); window.setInterval('dashboard.getUsers()', {{ time_refresh_long }}); window.setInterval('cpuu_usage()', {{ time_refresh }}); - window.setInterval('traffic_usage()', {{ time_refresh }}); + window.setInterval('traffic_usage()', {{ time_refresh_net }}); }); $(function pageLoad() { diff --git a/usage/views.py b/usage/views.py index bf484dc..5a7e715 100755 --- a/usage/views.py +++ b/usage/views.py @@ -4,10 +4,11 @@ from django.template import RequestContext from django.utils import simplejson from main.views import * -from pydash.settings import TIME_JS_REFRESH, TIME_JS_REFRESH_LONG +from pydash.settings import TIME_JS_REFRESH, TIME_JS_REFRESH_LONG, TIME_JS_REFRESH_NET time_refresh = TIME_JS_REFRESH time_refresh_long = TIME_JS_REFRESH_LONG +time_refresh_net = TIME_JS_REFRESH_NET def uptime(request): """ @@ -304,14 +305,14 @@ def gettraffic(request): del datasets_out_o[0] if len(datasets_in) <= 9: - datasets_in.append(float(((datasets_in_i[1] - datasets_in_i[0]) / 1024 ) / ( time_refresh / 1000 ))) + datasets_in.append(float(((datasets_in_i[1] - datasets_in_i[0]) / 1024 ) / ( time_refresh_net / 1000 ))) if len(datasets_in) == 10: - datasets_in.append(float(((datasets_in_i[1] - datasets_in_i[0]) / 1024 ) / ( time_refresh / 1000 ))) + datasets_in.append(float(((datasets_in_i[1] - datasets_in_i[0]) / 1024 ) / ( time_refresh_net / 1000 ))) del datasets_in[0] if len(datasets_out) <= 9: - datasets_out.append(float(((datasets_out_o[1] - datasets_out_o[0]) / 1024 ) / ( time_refresh / 1000 ))) + datasets_out.append(float(((datasets_out_o[1] - datasets_out_o[0]) / 1024 ) / ( time_refresh_net / 1000 ))) if len(datasets_out) == 10: - datasets_out.append(float(((datasets_out_o[1] - datasets_out_o[0]) / 1024 ) / ( time_refresh / 1000 ))) + datasets_out.append(float(((datasets_out_o[1] - datasets_out_o[0]) / 1024 ) / ( time_refresh_net / 1000 ))) del datasets_out[0]