Merge branch 'master' of github.com:tech-server/tgmanage

1 files changed, 3 insertions, 3 deletions

diff --git a/web/nms.gathering.org/api/public/ping b/web/nms.gathering.org/api/public/ping
index db46b00..811708d 100755
--- a/web/nms.gathering.org/api/public/ping
+++ b/web/nms.gathering.org/api/public/ping
@@ -4,9 +4,9 @@ use strict;
 use warnings;
 use nms::web;
 
-nms::web::setwhen('10s');
+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();
@@ -32,6 +32,6 @@ while ( my $ref = $lq->fetchrow_hashref() ) {
     $nms::web::json{'linknets'}{$ref->{'linknet'}} = [ $ref->{'latency1_ms'}, $ref->{'latency2_ms'} ];
 }
 
-$nms::web::cc{'max-age'} = "2";
+$nms::web::cc{'max-age'} = "1";
 $nms::web::cc{'stale-while-revalidate'} = "15";
 finalize_output();