www: system monitor fix

system monitor can be now enabled or disabled from web interface in management.php page.

www: system monitor fix
system monitor can be now enabled or disabled from web interface in management.php page.
c76dd524 · José Luis Gutiérrez · Alessandro Rubini · 166aaf38 · c76dd524
Commit c76dd524 authored Jul 08, 2015 by José Luis Gutiérrez Committed by Alessandro Rubini Jul 15, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 4 deletions

functions.php userspace/rootfs_override/var/www/functions.php +11 -4

No files found.
--- a/userspace/rootfs_override/var/www/functions.php
+++ b/userspace/rootfs_override/var/www/functions.php
@@ -341,8 +341,13 @@ function check_snmp_status(){
 }
 function check_monit_status(){
-	$output = intval(shell_exec("ps aux | grep -c monit"));
+	$output = shell_exec("/bin/ps axo command,state | grep '^/usr/bin/monit' | awk '{print $2}'");
-	return ($output>2) ? 1 : 0;	
+	if(empty($output) || (strpos($output,'T') !== false)){
+		return 0; /* monit is disabled or not in dotconfig */
+	}else{
+		return 1; /* monit is running */
+	}
 }
 function wrs_interface_setup(){
@@ -763,11 +768,13 @@ function wrs_management(){
 			if(check_monit_status()){ //It is running
 				//Stop SNMP
-				shell_exec("/bin/sh /etc/init.d/monit.sh stop > /dev/null 2>&1 &");
+				shell_exec("/etc/init.d/monit.sh stop > /dev/null 2>&1 &");
+				echo "i have disable it<br>";
 			}else{ //Not running
-				shell_exec("/bin/sh /etc/init.d/monit.sh start > /dev/null 2>&1 &");
+				shell_exec("/etc/init.d/monit.sh start > /dev/null 2>&1 &");
+				echo "i have enable it<br>";
 			}