Small bugfix to refreshing stats

Index was not reset properly when it reached the end of the table. RTS are slow but it may be possible to implement websockets to them.
gmemstr · Feb 27, 2017 · 1784ac6 · 1784ac6
1 parent 9139aad
commit 1784ac6
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 23 deletions.
diff --git a/App.py b/App.py
@@ -28,7 +28,7 @@
 
     elif config.Get("enable_webserver") is True:
         print("Webserver starting up")
-        scnp = Process(target=scn.Loop()).start()
+        # scnp = Process(target=scn.Loop()).start()
         wsp = Process(target=ws.Run()).start()
 
 

diff --git a/src/static/platypus.js b/src/static/platypus.js
@@ -1,40 +1,31 @@
 window.onload = checkNight;
 // Function that refreshes each
 // panels stats indivudually
-setInterval(RequestStat, 2000);
-i = 0;
+setInterval(RequestStat, 1000);
 var table = document.getElementById("table");
+var i=0;
 
 function RequestStat() {
     if (document.getElementById("rts").checked == true) {
-        var row = table.rows[i];
-        var panel = row.id;
-        Request("/fetch/" + panel, function(text) {
-            res = JSON.parse(text);
-            if (res[panel]['online'] == 0) {
-                row.cells[0].innerHTML = res[panel]['name'] + "<strong>OFFLINE</strong>";
-                row.cells[2].innerHTML = "0%";
-                row.cells[3].innerHTML = "0%";
-                row.cells[4].innerHTML = "0%";
-            } else {
-                row.cells[0].innerHTML = res[panel]['name'];
-                row.cells[2].innerHTML = res[panel]['cpu'] + "%";
-                row.cells[3].innerHTML = res[panel]['memory'] + "%";
-                row.cells[4].innerHTML = res[panel]['disk'] + "%";
-            }
-        });
-        if (i > table.rows.length){ i=0; }else{ i++; }
-    }
+            if (i < table.rows.length){ i++; }
+            else { i = 0; }
+            //console.log(i);
+            var row = table.rows[i];
+            var panel = row.id;
+            //console.log(row);
+            Request(panel, setRow, "GET", row);
+        }
 }
 
-function Request(url, callback, method = "GET") {
+function Request(panel, callback, method = "GET", row) {
+    url = "/fetch/"+panel;
     var request = new XMLHttpRequest();
     request.open(method, url);
     request.send();
 
     request.onreadystatechange = function() {
         if (request.readyState == 4 && request.status == 200)
-            callback(request.responseText);
+            callback(request.responseText,panel,row);
     }
 }
 
@@ -46,6 +37,23 @@ function toggleRts() {
     }
 }
 
+function setRow(text,panel,row){
+    //console.log(text);
+    //console.log(panel)
+    res = JSON.parse(text);
+    if (res[panel]['online'] == 0 || res[panel]['online'] == null) {
+        row.cells[0].innerHTML = res[panel]['name'] + "<strong>OFFLINE</strong>";
+        row.cells[2].innerHTML = "0%";
+        row.cells[3].innerHTML = "0%";
+        row.cells[4].innerHTML = "0%";
+    } else {
+        row.cells[0].innerHTML = res[panel]['name'];
+        row.cells[2].innerHTML = res[panel]['cpu'] + "%";
+        row.cells[3].innerHTML = res[panel]['memory'] + "%";
+        row.cells[4].innerHTML = res[panel]['disk'] + "%";
+    }
+}
+
 function toggleNight() {
     if (localStorage.nightmode != "true") {
         document.body.classList.add("nightmode");