Merge remote-tracking branch 'origin/master' into prod

* origin/master: Implement 304 Not Modified use $rrdfile everywhere Conflicts: import index
2015-02-01 22:28:52 +01:00 · 2015-02-01 22:28:52 +01:00 · 1d04dec062
commit 1d04dec062
parent 4968e925fb b969488ac6
6 changed files with 48 additions and 37 deletions
--- a/8
+++ b/8
@ -64,13 +64,13 @@ do
 	ds="${ds//ds[/}"
 	ds="${ds//]*/}"
 	datasets+=("$ds")
-done < <(rrdtool info ingress.rrd |grep index)
+done < <(rrdtool info "$rrdfile" |grep index)
 for ds in ${dsnames[@]}
 do
 	if [[ ! ${datasets[@]} =~ $ds ]]
 	then
-		cp -f ingress.rrd ingress.rrd.bak_add_$ds
-		./dsaddtor.pl ingress.rrd $ds GAUGE $((48*60*60)) 0 NaN
+		cp -f "$rrdfile" "$rrdfile".bak_add_$ds
+		./dsaddtor.pl "$rrdfile" $ds GAUGE $((48*60*60)) 0 NaN
 	fi
 done
 data=N
@ -82,7 +82,7 @@ do
 done

 echo ${POST["innovator"]} > .innovator
-rrdtool update ingress.rrd -t $template "$data"
+rrdtool update "$rrdfile" -t $template "$data"

 if [ -n "$CACHE_DIR" ]
 then
--- a/add.html
+++ b/add.html
@ -24,11 +24,10 @@ do
 done
 read_query_string

+send_headers <<-EOHead
+	content-type: text/xml
+EOHead
 cat <<-EOHTML
-content-type: text/xml
-Last-Modified: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z')
-Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z')
-
 <?xml  version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
 	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
--- a/19
+++ b/19
@ -66,21 +66,20 @@ then
 		ds="${ds//ds[/}"
 		ds="${ds//]*/}"
 		datasets+=("$ds")
-	done < <(rrdtool info ingress.rrd |grep index)
+	done < <(rrdtool info "$rrdfile" |grep index)
 	for ds in ${dsnames[@]}
 	do
 		if [[ ! ${datasets[@]} =~ $ds ]]
 		then
-			[[ -f ingress.rrd.bak ]] && mv ingress.rrd.bak ingress.rrd.bak_before_add_$ds
-			cp -f ingress.rrd ingress.rrd.bak_add_$ds
-			./dsaddtor.pl ingress.rrd $ds GAUGE $((48*60*60)) 0 NaN 2>&1
+			cp -f "$rrdfile" "$rrdfile".bak_add_$ds
+			./dsaddtor.pl "$rrdfile" $ds GAUGE $((48*60*60)) 0 NaN
 		fi
 	done

 	while read date hour data
 	do
 		data=$(date -d "$date $hour" +%s):${data// /:}
-		rrdtool update ingress.rrd -t $template "$data" 2>&1
+		rrdtool update "$rrdfile" -t $template "$data" 2>&1
 	done <<<"${POST["data"]}"

 	if [ -n "$CACHE_DIR" ]
@ -89,11 +88,11 @@ then
 		echo $'\nCache cleared!'
 	fi
 else
-	cat <<-EOHTML
-	content-type: text/xml
-	Last-Modified: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z')
-	Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z')
+	send_headers <<-EOHead
+		content-type: text/xml
+	EOHead

+	cat <<-EOHTML
 	<?xml  version="1.0" encoding="UTF-8"?>
 	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
 		"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
@ -107,7 +106,7 @@ else
 	EOHTML
 	if ! [ -w "$rrdfile" ]
 	then
-		rrdtool create ingress.rrd -s $((60*60))		\
+		rrdtool create "$rrdfile" -s $((60*60))		\
 			DS:AP:GAUGE:$((2*24*60*60)):0:NaN		\
 			DS:Explorer:GAUGE:$((48*60*60)):0:NaN		\
 			DS:Seer:GAUGE:$((48*60*60)):0:NaN		\
--- a/27
+++ b/27
@ -39,6 +39,11 @@ read_query_string

 if [ -z "$graph" ]
 then
+	send_headers <<-EOHead
+		content-type: application/xhtml+xml
+		refresh: 300
+	EOHead
+
 	readlast
 	medals
 	get_current_level
@ -54,14 +59,6 @@ then
 		title="IngRRD - $webuser [L$curlevel] - Overview"
 	fi
 	cat <<-EOHTML
-		content-type: application/xhtml+xml
-		Last-Modified: $(
-			LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z'	\
-			-d @$(rrdtool last ingress.rrd)
-		)
-		Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z' -d '1 hour')
-		refresh: 300
-
 		<?xml  version="1.0" encoding="UTF-8"?>
 		<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
 			"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
@ -376,7 +373,7 @@ then
 			<table style="width:$(( graph_width + 97 ))px">
 				<tr>
 					<td>
-						<a href="?hist&amp;start=$(rrdtool first ingress.rrd)&amp;end=$end">First</a>
+						<a href="?hist&amp;start=$(rrdtool first "$rrdfile")&amp;end=$end">First</a>
 						<a href="?hist&amp;start=$(( start - 365 * 86400 ))&amp;end=$end">-Y</a>
 						<a href="?hist&amp;start=$(( start - 30 * 86400 ))&amp;end=$end">-M</a>
 						<a href="?hist&amp;start=$(( start - 604800 ))&amp;end=$end">-W</a>
@ -479,17 +476,11 @@ then
 		</body></html>
 	EOHTML
 else
-	now=$(date +%s)
-	cat <<-EOHEAD
+	send_headers <<-EOHead
 		content-type: image/png
-		Last-Modified: $(
-			LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z'	\
-			-d @$(rrdtool last ingress.rrd)
-		)
-		Expires: $(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z' -d '1 hour')
-
-	EOHEAD
+	EOHead

+	now=$(date +%s)
 	if [[ $graph == AP ]]
 	then
 		thresholds=(
--- a/lib/readold
+++ b/lib/readold
@ -18,6 +18,6 @@ readold() {
 				done
 			)
 	} < <(
-		rrdtool fetch -s "$when" ingress.rrd AVERAGE | sed '/: nan/d'
+		rrdtool fetch -s "$when" "$rrdfile" AVERAGE | sed '/: nan/d'
 	)
 }
--- a/lib/send_headers
+++ b/lib/send_headers
@ -0,0 +1,22 @@
+#!/bin/bash
+
+send_headers() {
+	local timestamp do_exit header thisdate expiredate
+	read timestamp < <(stat -c %Y $0 "$rrdfile" lib/* |sort -r)
+	thisdate=$(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z' -d @$timestamp)
+	expiredate=$(LC_ALL=C TZ=GMT date +'%a, %d %b %Y %X %Z' -d '+1 minute')
+	if [[ $thisdate == $HTTP_IF_MODIFIED_SINCE ]]
+	then
+		echo "Status: 304 Not Modified"
+		do_exit=1
+	fi
+	echo "Last-Modified: $thisdate"
+	echo "Expires: $expiredate"
+	echo "Cache-Control: must-revalidate, max-age=60"
+	while read header
+	do
+		echo "$header"
+	done
+	echo
+	(( do_exit )) && exit
+}