From d73dc9987b4d75f77246d4821c3704031b8fbc5a Mon Sep 17 00:00:00 2001 From: doktornotor Date: Wed, 30 Sep 2015 11:31:47 +0200 Subject: Fix squid_dash_z() logic so that it creates cache dir properly when it has changed --- config/squid3/34/squid.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'config') diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc index e44dbe62..0faba446 100755 --- a/config/squid3/34/squid.inc +++ b/config/squid3/34/squid.inc @@ -136,18 +136,18 @@ function squid_dash_z($cache_action = 'none') { return; } - if ($cache_action == "clean" && is_dir($cachedir)) { + if ($cache_action == "clean" || (!is_dir($cachedir))) { // cannot nuke disk cache while Squid is running squid_stop_monitor(); if (is_service_running('squid')) { stop_service("squid"); } - rename($cachedir, "{$cachedir}.old"); - mwexec_bg("/bin/rm -rf {$cachedir}.old"); + if (is_dir($cachedir)) { + rename($cachedir, "{$cachedir}.old"); + mwexec_bg("/bin/rm -rf {$cachedir}.old"); + } squid_create_cachedir(); squid_restart_services(); - } else { - squid_create_cachedir(); } } -- cgit v1.2.3