From 922e5782465a7b4e80abe12a6d015b0d30c87ae6 Mon Sep 17 00:00:00 2001
From: Ramil Valitov <ramilvalitov@gmail.com>
Date: Tue, 21 Jul 2020 15:59:42 +0300
Subject: [PATCH] [add, fix] cache of PHP run directory

---
 tests/all.sh | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/tests/all.sh b/tests/all.sh
index 841e690..b9a3a0e 100644
--- a/tests/all.sh
+++ b/tests/all.sh
@@ -10,6 +10,8 @@ MAX_PORTS_COUNT=100
 TEST_SOCKET=""
 ONDEMAND_TIMEOUT=60
 ZABBIX_TIMEOUT=20
+PHP_SOCKET_DIR=""
+PHP_ETC_DIR=""
 
 function getUserParameters() {
   sudo find /etc/zabbix/ -name 'userparameter_php_fpm.conf' -type f | head -n1
@@ -40,13 +42,19 @@ function getPHPVersion() {
 }
 
 function getEtcPHPDirectory() {
+  if [[ -n "$PHP_ETC_DIR" ]]; then
+    echo "$PHP_ETC_DIR"
+    return 0
+  fi
+
   LIST_OF_DIRS=(
     "/etc/php/"
     "/etc/php5/"
   )
   for PHP_TEST_DIR in "${LIST_OF_DIRS[@]}"; do
     if [[ -d "$PHP_TEST_DIR" ]]; then
-      echo "$PHP_TEST_DIR"
+      PHP_ETC_DIR=$PHP_TEST_DIR
+      echo "$PHP_ETC_DIR"
       return 0
     fi
   done
@@ -55,6 +63,11 @@ function getEtcPHPDirectory() {
 }
 
 function getRunPHPDirectory() {
+  if [[ -n "$PHP_SOCKET_DIR" ]]; then
+    echo "$PHP_SOCKET_DIR"
+    return 0
+  fi
+
   LIST_OF_DIRS=(
     "/run/"
     "/var/run/"
@@ -62,7 +75,8 @@ function getRunPHPDirectory() {
   for PHP_TEST_DIR in "${LIST_OF_DIRS[@]}"; do
     RESULT_DIR=$(find "$PHP_TEST_DIR" -name 'php*-fpm.sock' -type s -exec dirname {} \; 2>/dev/null | sort | head -n1)
     if [[ -d "$RESULT_DIR" ]]; then
-      echo "$RESULT_DIR/"
+      PHP_SOCKET_DIR="$RESULT_DIR/"
+      echo "$PHP_SOCKET_DIR"
       return 0
     fi
   done
@@ -165,6 +179,9 @@ setupPools() {
   assertEquals "Failed to find PHP directory" "0" "$EXIT_CODE"
   PHP_LIST=$(sudo find "$PHP_DIR" -name 'www.conf' -type f)
 
+  #Call to detect and cache PHP run directory, we need to call it before we stop all PHP-FPM
+  getRunPHPDirectory
+
   #First we need to stop all PHP-FPM
   while IFS= read -r pool; do
     if [[ -n $pool ]]; then