aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-05-06 14:19:42 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-05-06 14:19:42 -0300
commitbebf2ff9b37e609d08775388fe95ddc031d2fef3 (patch)
tree8d9e4a6d962e71733bbb198d707cdc5c2427538a /config
parentfc0424c3434c2464094c019863169a3143dd1d65 (diff)
downloadpfsense-packages-bebf2ff9b37e609d08775388fe95ddc031d2fef3.tar.gz
pfsense-packages-bebf2ff9b37e609d08775388fe95ddc031d2fef3.tar.bz2
pfsense-packages-bebf2ff9b37e609d08775388fe95ddc031d2fef3.zip
Simplify logic
Diffstat (limited to 'config')
-rwxr-xr-xconfig/squid3/34/squid.inc8
1 files changed, 3 insertions, 5 deletions
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index d78aa27c..a6460af8 100755
--- a/config/squid3/34/squid.inc
+++ b/config/squid3/34/squid.inc
@@ -1959,11 +1959,9 @@ function squid_resync($via_rpc="no") {
if (!is_service_running('squid')) {
log_error("Starting Squid");
mwexec(SQUID_BASE . "/sbin/squid -f " . SQUID_CONFFILE);
- } else {
- if (!isset($boot_process)) {
- log_error("Reloading Squid for configuration sync");
- mwexec(SQUID_BASE . "/sbin/squid -k reconfigure -f " . SQUID_CONFFILE);
- }
+ } else if (!isset($boot_process)) {
+ log_error("Reloading Squid for configuration sync");
+ mwexec(SQUID_BASE . "/sbin/squid -k reconfigure -f " . SQUID_CONFFILE);
}
// Sleep for a couple seconds to give squid a chance to fire up fully.