diff options
| author | Ermal <eri@pfsense.org> | 2010-12-29 11:07:41 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-12-29 11:07:41 +0000 |
| commit | d4c84dfdbad19306d1ef2827fcb4fc436b908106 (patch) | |
| tree | 4c10f7cbf4b6accbe2ec6585b10f20341dadccc1 /config/squid | |
| parent | 76aab977b8cd6b7cf7b24a018cdd5107956f5109 (diff) | |
| download | pfsense-packages-d4c84dfdbad19306d1ef2827fcb4fc436b908106.tar.gz pfsense-packages-d4c84dfdbad19306d1ef2827fcb4fc436b908106.tar.bz2 pfsense-packages-d4c84dfdbad19306d1ef2827fcb4fc436b908106.zip | |
Do not call filter_configure_sync directly since this is not best practice
Diffstat (limited to 'config/squid')
| -rw-r--r-- | config/squid/proxy_monitor.sh | 8 | ||||
| -rw-r--r-- | config/squid/squid.inc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/config/squid/proxy_monitor.sh b/config/squid/proxy_monitor.sh index fab2ee54..fa5a87bb 100644 --- a/config/squid/proxy_monitor.sh +++ b/config/squid/proxy_monitor.sh @@ -41,7 +41,7 @@ sleep 5 # Squid monitor 1.2 while [ /bin/true ]; do if [ ! -f /var/run/squid_alarm ]; then - NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'` + NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'` if [ $NUM_PROCS -lt 1 ]; then # squid is down echo "Squid has exited. Reconfiguring filter." | \ @@ -50,16 +50,16 @@ while [ /bin/true ]; do /usr/local/etc/rc.d/squid.sh start sleep 3 echo "Reconfiguring filter..." | logger -p daemon.info -i -t Squid_Alarm - /etc/rc.filter_configure_sync + /etc/rc.filter_configure touch /var/run/squid_alarm fi fi - NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'` + NUM_PROCS=`ps auxw | grep "[s]quid -D"|awk '{print $2}'| wc -l | awk '{ print $1 }'` if [ $NUM_PROCS -gt 0 ]; then if [ -f /var/run/squid_alarm ]; then echo "Squid has resumed. Reconfiguring filter." | \ logger -p daemon.info -i -t Squid_Alarm - /etc/rc.filter_configure_sync + /etc/rc.filter_configure rm /var/run/squid_alarm fi fi diff --git a/config/squid/squid.inc b/config/squid/squid.inc index 8dd2cc8e..3848b818 100644 --- a/config/squid/squid.inc +++ b/config/squid/squid.inc @@ -266,7 +266,7 @@ function squid_deinstall_command() { 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"); update_status("Reloading filter..."); - filter_configure_sync(); + filter_configure(); } function squid_before_form_general($pkg) { |