diff --git a/main/views.py b/main/views.py
index 6911fe4..5cc5fd6 100755
--- a/main/views.py
+++ b/main/views.py
@@ -8,9 +8,10 @@ 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
+from pydash.settings import TIME_JS_REFRESH, TIME_JS_REFRESH_LONG
time_refresh = TIME_JS_REFRESH
+time_refresh_long = TIME_JS_REFRESH_LONG
def index(request):
"""
@@ -102,14 +103,14 @@ def get_users():
pipe = os.popen("who |" + "awk '{print $1, $2, $6}'")
data = pipe.read().strip().split('\n')
pipe.close()
-
+
data = [i.split(None, 3) for i in data]
except Exception, err:
data = str(err)
- if not data:
- data = ['No data available']
+ if data[0] == []:
+ data = [['No', 'data', 'available']]
return data
@@ -235,5 +236,6 @@ def getall(request):
'gettraffic': get_traffic('eth0'),
#'getusers': get_users(),
'getcpuusage': get_cpu_usage(),
- 'time_refresh': time_refresh
+ 'time_refresh': time_refresh,
+ 'time_refresh_long': time_refresh_long
}, context_instance=RequestContext(request))
diff --git a/pydash/settings.py b/pydash/settings.py
index 084f28f..6c244b2 100644
--- a/pydash/settings.py
+++ b/pydash/settings.py
@@ -31,6 +31,7 @@ ADMINS = (
MANAGERS = ADMINS
TIME_JS_REFRESH = 30000
+TIME_JS_REFRESH_LONG = 120000
ALLOWED_HOSTS = ['*']
diff --git a/templates/main.html b/templates/main.html
index 2602f87..dce8961 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -69,7 +69,7 @@
OS: {{ getplatform }}
- Uptime: Hours
+ Uptime: Hours
Hostname: {{ gethostname }}
CPU(s): {{ getcpus.cpus }} x {{ getcpus.type }}
@@ -280,8 +280,8 @@ function get_os_data(url, element) {
var dashboard = {};
-dashboard.getOs = function() {
- get_os_data('/info/uptime/', "#os-uptime");
+dashboard.getUptime = function() {
+ get_os_data('/info/uptime/', "#get-uptime");
}
dashboard.getDisk = function() {
$.getJSON('/info/getdisk/{{ getdisk }}', function(data) {
@@ -347,12 +347,21 @@ var load_ctx = $("#loadChart").get(0).getContext("2d");
$(function() {
window.setInterval('memory_usage()', {{ time_refresh }});
window.setInterval('load_average()', {{ time_refresh }});
- window.setInterval('dashboard.getOs()', {{ time_refresh }});
- window.setInterval('dashboard.getDisk()', {{ time_refresh }});
- window.setInterval('dashboard.getUsers()', {{ time_refresh }});
+ window.setInterval('dashboard.getUptime()', {{ time_refresh_long }});
+ window.setInterval('dashboard.getDisk()', {{ time_refresh_long }});
+ window.setInterval('dashboard.getUsers()', {{ time_refresh_long }});
window.setInterval('cpuu_usage()', {{ time_refresh }});
});
-
+
+$(function pageLoad() {
+ memory_usage();
+ load_average();
+ cpuu_usage();
+ dashboard.getUptime();
+ dashboard.getDisk();
+ dashboard.getUsers();
+ });
+
{% endblock %}
diff --git a/usage/views.py b/usage/views.py
index 0253f9a..992d50b 100755
--- a/usage/views.py
+++ b/usage/views.py
@@ -4,9 +4,10 @@ from django.template import RequestContext
from django.utils import simplejson
from main.views import *
-from pydash.settings import TIME_JS_REFRESH
+from pydash.settings import TIME_JS_REFRESH, TIME_JS_REFRESH_LONG
time_refresh = TIME_JS_REFRESH
+time_refresh_long = TIME_JS_REFRESH_LONG
def uptime(request):
"""
@@ -231,4 +232,4 @@ def loadaverage(request):
response['Content-Type'] = "text/javascript"
response.cookies['load_average'] = datasets
response.write(data)
- return response
\ No newline at end of file
+ return response