From ae28f0b1b1e584fbe7ee818020a07d647548785f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magnus=20Kir=C3=B8?= <magnuskiro@gmail.com>
Date: Sun, 20 Mar 2016 20:31:54 +0100
Subject: web.pm spellingmistake jso->json

---
 include/nms/web.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/nms/web.pm')

diff --git a/include/nms/web.pm b/include/nms/web.pm
index 2a5e132..b36d692 100755
--- a/include/nms/web.pm
+++ b/include/nms/web.pm
@@ -81,7 +81,7 @@ sub finalize_output {
 	printcc;
 	
 	print "Etag: $hash\n";
-	print "Content-Type: text/jso; charset=utf-8\n\n";
+	print "Content-Type: text/json; charset=utf-8\n\n";
 	print JSON::XS::encode_json(\%json);
 	print "\n";
 }
-- 
cgit v1.2.3


From 348d197899f37e535feefd5055ae8ef553a71bdf Mon Sep 17 00:00:00 2001
From: Kristian Lyngstol <kly@kly@.no>
Date: Tue, 22 Mar 2016 23:27:32 +0100
Subject: NMS: "Dirty" hack to get switches.then in switch-state

---
 include/nms/web.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'include/nms/web.pm')

diff --git a/include/nms/web.pm b/include/nms/web.pm
index b36d692..c9f7236 100755
--- a/include/nms/web.pm
+++ b/include/nms/web.pm
@@ -58,13 +58,18 @@ sub db_safe_quote {
 sub setwhen {
 	$now = "now()";
 	my $window = '15m';
-	if (@_ == 1) {
+	my $offset = '0s';
+	if (@_ > 0) {
 		$window = $_[0];
 	}
+	if (@_ > 1) {
+		$offset = $_[1];
+	}
 	if (defined($get_params{'now'})) {
 		$now = db_safe_quote('now') . "::timestamp ";
 		$cc{'max-age'} = "3600";
 	}
+	$now = "(" . $now . " - '" . $offset . "'::interval)";
 	$when = " time > " . $now . " - '".$window."'::interval and time < " . $now . " ";
 }
 
-- 
cgit v1.2.3


From 004f4efcfd0779f4307b90fed139dc87d01ad0b9 Mon Sep 17 00:00:00 2001
From: Kristian Lyngstol <kly@kly@.no>
Date: Sat, 26 Mar 2016 03:48:12 +0100
Subject: NMS: Various performance tweaks

---
 include/nms/web.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'include/nms/web.pm')

diff --git a/include/nms/web.pm b/include/nms/web.pm
index c9f7236..889e774 100755
--- a/include/nms/web.pm
+++ b/include/nms/web.pm
@@ -57,7 +57,7 @@ sub db_safe_quote {
 # endpoints it is better to return no data than old data (e.g.: ping).
 sub setwhen {
 	$now = "now()";
-	my $window = '15m';
+	my $window = '8m';
 	my $offset = '0s';
 	if (@_ > 0) {
 		$window = $_[0];
@@ -86,6 +86,8 @@ sub finalize_output {
 	printcc;
 	
 	print "Etag: $hash\n";
+	print "Access-Control-Allow-Origin: *\n";
+	print "Access-Control-Allow-Methods: HEAD, GET\n";
 	print "Content-Type: text/json; charset=utf-8\n\n";
 	print JSON::XS::encode_json(\%json);
 	print "\n";
-- 
cgit v1.2.3