aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/squid.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/squid.inc b/packages/squid.inc
index f6febd73..7b68a2e3 100644
--- a/packages/squid.inc
+++ b/packages/squid.inc
@@ -81,7 +81,7 @@ EOD;
}
/* kill any running proxy alarm scripts */
- mwexec("ps awux | grep \"proxy_monitor\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
+ mwexec("ps awux | grep \"proxy_monitor\" | grep -v \"grep\" | grep -v \"php\" | awk '{ print $2 }' | xargs kill");
/* restart proxy alarm scripts */
mwexec_bg("/usr/local/etc/rc.d/proxy_monitor.sh");
@@ -93,7 +93,7 @@ EOD;
function squid_deinstall_command() {
mwexec('rm -rf ' . CACHEDIR);
mwexec('rm -f /usr/local/etc/rc.d/proxy_monitor.sh');
- mwexec("ps awux | grep \"proxy_monitor\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
+ mwexec("ps awux | grep \"proxy_monitor\" | grep -v \"grep\" | grep -v \"php\" | awk '{ print $2 }' | xargs kill");
mwexec("ps awux | grep \"squid\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
mwexec("ps awux | grep \"dnsserver\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
mwexec("ps awux | grep \"unlinkd\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
@@ -335,7 +335,7 @@ EOD;
}
/* kill any running proxy alarm scripts */
- mwexec("ps awux | grep \"proxy_monitor\" | grep -v \"grep\" | awk '{ print $2 }' | xargs kill");
+ mwexec("ps awux | grep \"proxy_monitor\" | grep -v \"grep\" | grep -v \"php\" | awk '{ print $2 }' | xargs kill");
/* restart proxy alarm scripts */
mwexec_bg("/usr/local/etc/rc.d/proxy_monitor.sh");