Cleanup the status queues so it does not does stupid things.

Apparnetly this needs to be converted to 'ajax' calls as the traffic graph but for now live with this.

2 files changed, 1 insertions, 9 deletions

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 6988667..24bb640 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -1923,7 +1923,7 @@ function WakeOnLan($addr, $mac)
  *                             NOTE: this command takes 5 seconds to run
  */
 function gather_altq_queue_stats($dont_return_root_queues) {
-	$stats = `/sbin/pfctl -vvsq & /bin/sleep 5`;
+	$stats = exec("/sbin/pfctl -vvsq");
 	$stats_array = split("\n", $stats);
 	$queue_stats = array();
 	foreach ($stats_array as $stats_line) {
diff --git a/usr/local/www/status_queues.php b/usr/local/www/status_queues.php
index 276e1f6..6b2673d 100755
--- a/usr/local/www/status_queues.php
+++ b/usr/local/www/status_queues.php
@@ -40,7 +40,6 @@
 require("guiconfig.inc");
 
 if($_GET['reset'] <> "") {
-	mwexec("killall pfctl");
 	Header("Location: status_queues.php");
 	exit;
 }
@@ -143,7 +142,6 @@ While(!Connection_Aborted()) {
 	$i = 0;
 	foreach($stats_array as $stats_line) {
 		if($stat_line_split[2] == "" and $counter > 1) {
-			mwexec("/usr/bin/killall pfctl");
 			exit;
 		}
 
@@ -180,13 +178,7 @@ While(!Connection_Aborted()) {
 	if($counter > 100) {
 		echo "Redirecting to <a href=\"status_queues.php\">Queue Status</a>.<p>";
 		echo "<meta http-equiv=\"refresh\" content=\"1;url={$_SERVER['SCRIPT_NAME']}\">";
-		mwexec("/usr/bin/killall pfctl");
-		mwexec("/usr/bin/killall pfctl");
 		exit;
 	}
 }
-
-mwexec("/usr/bin/killall pfctl");
-mwexec("/usr/bin/killall pfctl");
-
 ?>