aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid3/34
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-09-30 09:25:43 +0200
committerdoktornotor <notordoktor@gmail.com>2015-09-30 09:25:43 +0200
commit94a0c4dc98133ae78a58928c311cb1848f46869b (patch)
treed037513f3257bec017e12c5945e70a1ebb2336ac /config/squid3/34
parentcfcec18e460d0927a276b0c7ac8968cdbf3d1c5e (diff)
downloadpfsense-packages-94a0c4dc98133ae78a58928c311cb1848f46869b.tar.gz
pfsense-packages-94a0c4dc98133ae78a58928c311cb1848f46869b.tar.bz2
pfsense-packages-94a0c4dc98133ae78a58928c311cb1848f46869b.zip
split Squid services monitoring/handling to separate functions
Diffstat (limited to 'config/squid3/34')
-rwxr-xr-xconfig/squid3/34/squid.inc57
1 files changed, 39 insertions, 18 deletions
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index a11a29ac..40abd166 100755
--- a/config/squid3/34/squid.inc
+++ b/config/squid3/34/squid.inc
@@ -2000,6 +2000,38 @@ function squid_resync($via_rpc = "no") {
chgrp(SQUID_LOCALBASE . "/libexec/squid/pinger", SQUID_GID);
}
+ // check cache dir and create if necessary
+ squid_dash_z();
+
+ // restart Squid if enabled and reconfigure filter
+ squid_restart_services();
+ filter_configure();
+ conf_mount_ro();
+}
+
+function squid_stop_monitor() {
+ /* kill any running proxy alarm scripts */
+ log_error("Stopping any running proxy monitors");
+ if (exec("/bin/ps auxw | /usr/bin/grep '[s]qpmon'")) {
+ mwexec("/usr/local/etc/rc.d/sqp_monitor.sh stop");
+ }
+ sleep(1);
+}
+
+function squid_start_monitor() {
+ if (exec("/bin/ps auxw | /usr/bin/grep '[s]qpmon'")) {
+ log_error("Starting a proxy monitor script");
+ mwexec_bg("/usr/local/etc/rc.d/sqp_monitor.sh start");
+ }
+ sleep(1);
+}
+
+function squid_restart_services() {
+ // reconfigure and (re)start service as needed if enabled, otherwise stop them
+ // do not (re)start squid services on boot
+ if (platform_booting()) {
+ return;
+ }
$squid_enabled = false;
if (is_array($config['installedpackages']['squid']['config'])) {
// check if Squid is enabled
@@ -2013,16 +2045,10 @@ function squid_resync($via_rpc = "no") {
}
}
- // check cache dir and create if necessary
- squid_dash_z();
-
- // reconfigure and (re)start service as needed if enabled, otherwise stop them
- // do not (re)start squid services on boot
- if ((!isset($boot_process)) && ($squid_enabled)) {
+ if ($squid_enabled) {
/* kill any running proxy alarm scripts */
- log_error("Stopping any running proxy monitors");
- mwexec("/usr/local/etc/rc.d/sqp_monitor.sh stop");
- sleep(1);
+ squid_stop_monitor();
+
if (!is_service_running('squid')) {
log_error("Starting Squid");
mwexec(SQUID_BASE . "/sbin/squid -f " . SQUID_CONFFILE);
@@ -2037,21 +2063,16 @@ function squid_resync($via_rpc = "no") {
}
}
/* restart proxy alarm scripts */
- log_error("Starting a proxy monitor script");
- mwexec_bg("/usr/local/etc/rc.d/sqp_monitor.sh start");
- } elseif (!$squid_enabled) {
+ squid_start_monitor();
+
+ } else {
/* Squid is disabled - kill any running proxy alarm scripts and stop Squid services */
- log_error("Stopping any running proxy monitors");
- mwexec("/usr/local/etc/rc.d/sqp_monitor.sh stop");
- sleep(1);
+ squid_stop_monitor();
if (is_service_running('squid')) {
log_error("Stopping Squid");
stop_service("squid");
}
}
-
- filter_configure();
- conf_mount_ro();
}
function squid_print_javascript_auth() {