aboutsummaryrefslogtreecommitdiffstats
path: root/web/nms.gathering.org
diff options
context:
space:
mode:
authorKristian Lyngstol <kly@kly.no>2016-03-31 20:44:38 +0200
committerKristian Lyngstol <kly@kly.no>2016-03-31 20:44:38 +0200
commit51e9872f4ac5db633c12862dec951e0b91b1b132 (patch)
treeff156c63ba964357e955bfcf4634f0d02ea12609 /web/nms.gathering.org
parent37d9d6b9d78fcda093dfc37dc36ed8eb0eb09cd2 (diff)
NMS: Fix historic review, part one
The actual replay might still be bugged, but fixed-point review works.
Diffstat (limited to 'web/nms.gathering.org')
-rwxr-xr-xweb/nms.gathering.org/api/public/ping2
-rw-r--r--web/nms.gathering.org/js/nms-map-handlers.js3
2 files changed, 2 insertions, 3 deletions
diff --git a/web/nms.gathering.org/api/public/ping b/web/nms.gathering.org/api/public/ping
index 5d1037c..811708d 100755
--- a/web/nms.gathering.org/api/public/ping
+++ b/web/nms.gathering.org/api/public/ping
@@ -6,7 +6,7 @@ use nms::web;
nms::web::setwhen('15s');
-my $q = $nms::web::dbh->prepare("SELECT DISTINCT ON (sysname) (now() - time) as age,sysname, latency_ms FROM ping NATURAL JOIN switches WHERE time in (select max(time) from ping where "
+my $q = $nms::web::dbh->prepare("SELECT DISTINCT ON (sysname) (" . $nms::web::now . " - time) as age,sysname, latency_ms FROM ping NATURAL JOIN switches WHERE time in (select max(time) from ping where "
. $nms::web::when . " group by switch)");
$q->execute();
diff --git a/web/nms.gathering.org/js/nms-map-handlers.js b/web/nms.gathering.org/js/nms-map-handlers.js
index 474e8ef..a7672a3 100644
--- a/web/nms.gathering.org/js/nms-map-handlers.js
+++ b/web/nms.gathering.org/js/nms-map-handlers.js
@@ -373,14 +373,13 @@ function getDhcpColor(stop)
function dhcpUpdater()
{
- var realnow = Date.now();
- var now = Math.floor(realnow / 1000);
if (nmsData.dhcp == undefined || nmsData.dhcp.dhcp == undefined) {
return
}
if (nmsData.switches == undefined || nmsData.switches.switches == undefined) {
return;
}
+ var now = nmsData.dhcp.time;
try {
for (var sw in nmsData.switches.switches) {
var c = blue;