Merge pull request #618 from PiBa-NL/hap_stats_timers

haproxy-devel, make stats-tab refresh timers configurable.

3 files changed, 30 insertions, 4 deletions

diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc
index 8f7c2a9c..47a85604 100644
--- a/config/haproxy-devel/haproxy.inc
+++ b/config/haproxy-devel/haproxy.inc
@@ -733,7 +733,8 @@ function haproxy_writeconf($configpath) {
 			fwrite ($fd, "\tbind 127.0.0.1:$localstatsport\n");
 			fwrite ($fd, "\tmode http\n");
 			fwrite ($fd, "\tstats enable\n");
-			fwrite ($fd, "\tstats refresh 10\n");
+			if (is_numeric($a_global['localstats_refreshtime']))
+				fwrite ($fd, "\tstats refresh {$a_global['localstats_refreshtime']}\n");
 			fwrite ($fd, "\tstats admin if TRUE\n");
 			fwrite ($fd, "\tstats uri /haproxy_stats.php?haproxystats=1\n");
 			fwrite ($fd, "\ttimeout client 5000\n");
diff --git a/config/haproxy-devel/haproxy_global.php b/config/haproxy-devel/haproxy_global.php
index c860fa38..4e8a5e40 100755
--- a/config/haproxy-devel/haproxy_global.php
+++ b/config/haproxy-devel/haproxy_global.php
@@ -36,6 +36,8 @@ require_once("haproxy_utils.inc");
 require_once("globals.inc");
 require_once("pkg_haproxy_tabs.inc");
 
+$simplefields = array('localstats_refreshtime','localstats_sticktable_refreshtime');
+
 if (!is_array($config['installedpackages']['haproxy'])) 
 	$config['installedpackages']['haproxy'] = array();
 
@@ -68,7 +70,13 @@ if ($_POST) {
 			$input_errors[] = "The maximum number of connections should be numeric.";
 			
 		if ($_POST['localstatsport'] && (!is_numeric($_POST['localstatsport']))) 
-			$input_errors[] = "The local stats port should be numeric.";
+			$input_errors[] = "The local stats port should be numeric or empty.";
+			
+		if ($_POST['localstats_refreshtime'] && (!is_numeric($_POST['localstats_refreshtime']))) 
+			$input_errors[] = "The local stats refresh time should be numeric or empty.";
+
+		if ($_POST['localstats_sticktable_refreshtime'] && (!is_numeric($_POST['localstats_sticktable_refreshtime']))) 
+			$input_errors[] = "The local stats sticktable refresh time should be numeric or empty.";
 
 		/*if($_POST['synchost1'] && !is_ipaddr($_POST['synchost1']))
 			$input_errors[] = "Synchost1 needs to be an IPAddress.";
@@ -93,6 +101,8 @@ if ($_POST) {
 			$config['installedpackages']['haproxy']['localstatsport'] = $_POST['localstatsport'] ? $_POST['localstatsport'] : false;
 			$config['installedpackages']['haproxy']['advanced'] = $_POST['advanced'] ? base64_encode($_POST['advanced']) : false;
 			$config['installedpackages']['haproxy']['nbproc'] = $_POST['nbproc'] ? $_POST['nbproc'] : false;			
+			foreach($simplefields as $stat)
+				$config['installedpackages']['haproxy'][$stat] = $_POST[$stat];
 			touch($d_haproxyconfdirty_path);
 			write_config();
 		}
@@ -114,6 +124,8 @@ $pconfig['carpdev'] = $config['installedpackages']['haproxy']['carpdev'];
 $pconfig['localstatsport'] = $config['installedpackages']['haproxy']['localstatsport'];
 $pconfig['advanced'] = base64_decode($config['installedpackages']['haproxy']['advanced']);
 $pconfig['nbproc'] = $config['installedpackages']['haproxy']['nbproc'];
+foreach($simplefields as $stat)
+	$pconfig[$stat] = $config['installedpackages']['haproxy'][$stat];
 
 // defaults
 if (!$pconfig['logfacility'])
@@ -364,6 +376,18 @@ function enable_change(enable_change) {
 				</td>
 			</tr>
 			<tr>
+				<td width="22%" valign="top" class="vncell">Internal stats refresh rate</td>
+				<td class="vtable">
+					<input name="localstats_refreshtime" type="text" <?if(isset($pconfig['localstats_refreshtime'])) echo "value=\"{$pconfig['localstats_refreshtime']}\"";?> size="10" maxlength="5" /> Seconds, Leave this setting empty to not refresh the page automatically. EXAMPLE: 10
+				</td>
+			</tr>
+			<tr>
+				<td width="22%" valign="top" class="vncell">Sticktable page refresh rate</td>
+				<td class="vtable">
+					<input name="localstats_sticktable_refreshtime" type="text" <?if(isset($pconfig['localstats_sticktable_refreshtime'])) echo "value=\"{$pconfig['localstats_sticktable_refreshtime']}\"";?> size="10" maxlength="5" /> Seconds, Leave this setting empty to not refresh the page automatically. EXAMPLE: 10
+				</td>
+			</tr>
+			<tr>
 				<td colspan="2" valign="top" class="listtopic">Global Advanced pass thru</td>
 			</tr>
 			<tr>
diff --git a/config/haproxy-devel/haproxy_stats.php b/config/haproxy-devel/haproxy_stats.php
index 8ad04c92..752bd8d7 100644
--- a/config/haproxy-devel/haproxy_stats.php
+++ b/config/haproxy-devel/haproxy_stats.php
@@ -65,7 +65,8 @@ if (isset($_GET['haproxystats']) || isset($_GET['scope']) || (isset($_POST) && i
 }
 require_once("guiconfig.inc");
 if (isset($_GET['showsticktablecontent'])){
-	header("Refresh: 2");
+	if (is_numeric($pconfig['localstats_sticktable_refreshtime']))
+		header("Refresh: {$pconfig['localstats_sticktable_refreshtime']}");
 }
 $shortcut_section = "haproxy";
 require_once("haproxy.inc");
@@ -163,7 +164,7 @@ include("head.inc");
 if (isset($_GET['showsticktablecontent'])){
 	$sticktablename = $_GET['showsticktablecontent'];
 echo "<td colspan='2'>";
-	echo "TESTJe<br/>";
+	echo "Contents of the sticktable: $sticktablename<br/>";
 	$res = haproxy_socket_command("show table $sticktablename");
 	foreach($res as $line){
 		echo "<br/>".print_r($line,true);