From de55e8c580a8878977c4aa62f9867c2da8c01e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikki=20S=C3=B8rensen?= Date: Mon, 12 Mar 2018 18:14:58 +0100 Subject: [PATCH] Moving service type "A" into the logic with the others, to support the new $services_out format and individual cache server ip's --- scripts/lib/cli_mode.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/lib/cli_mode.php b/scripts/lib/cli_mode.php index 657f91c..a12ab96 100644 --- a/scripts/lib/cli_mode.php +++ b/scripts/lib/cli_mode.php @@ -198,10 +198,6 @@ class cli_mode echo "No services chosen" . PHP_EOL . PHP_EOL; return $this->services(); } - elseif (in_array("A", $services)) - { - return $files; - } else { // Ensure that nomather the order the json content is in we always find the correct service if the file name and the service name in the json match @@ -278,7 +274,7 @@ class cli_mode $services_out[$file] = $cache_server; } } - elseif ((is_int(intval($service)) && $service == $key1+1) || $service == strtolower(scrape_between($file, "../../", ".txt"))) + elseif ((is_int(intval($service)) && $service == $key1+1) || $service == strtolower(scrape_between($file, "../../", ".txt")) || $service == "A") { //Service is a int and and service match the file number we are lokking at, OR, the service name is the same as the file we are lokking in. if ($cache_server == "service_dependent")