Browse Source

add different time refresh for net

windows
Florian N 12 years ago
parent
commit
eaf3c57aa3
  1. 6
      main/views.py
  2. 1
      pydash/settings.py
  3. 2
      templates/main.html
  4. 11
      usage/views.py

6
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))

1
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 = ['*']

2
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() {

11
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]

Loading…
Cancel
Save