Status_Monitoring: Encode RRD errors returned in JSON. Fixes #9601

pfsense · Jun 25, 2019 · c52e392 · c52e392
1 parent ccff850
commit c52e392
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/sysutils/pfSense-Status_Monitoring/Makefile b/sysutils/pfSense-Status_Monitoring/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pfSense-Status_Monitoring
-PORTVERSION=	1.7.7
+PORTVERSION=	1.7.8
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty

diff --git a/sysutils/pfSense-Status_Monitoring/files/usr/local/www/rrd_fetch_json.php b/sysutils/pfSense-Status_Monitoring/files/usr/local/www/rrd_fetch_json.php
@@ -167,7 +167,7 @@ function monitoring_rrd_check($name) {
 
 	$rrd_array = rrd_fetch($settings['rrd_file'], $rrd_options);
 	if (!($rrd_array)) {
-		die ('{ "error" : "' . rrd_error() . '" }');
+		die ('{ "error" : ' . json_encode(rrd_error()) . ' }');
 	}
 
 	$ds_list = array_keys ($rrd_array['data']);