From e78a6dcf408d1fdba45f1abad02eda364fe43839 Mon Sep 17 00:00:00 2001
From: Patrick Van der Veken <patrick.vanderveken@cegeka.com>
Date: Tue, 25 Sep 2018 11:24:18 +0200
Subject: [PATCH] Improved detection of LOG_HEALTHY

---
 sources/lib/core/include_core.sh | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/sources/lib/core/include_core.sh b/sources/lib/core/include_core.sh
index 7896d9a..fc3e42e 100644
--- a/sources/lib/core/include_core.sh
+++ b/sources/lib/core/include_core.sh
@@ -1475,6 +1475,26 @@ do
         if (( HAS_FCONFIG != 0 ))
         then
             FCONFIG="Yes"
+            # *.conf.dist first
+            if [[ -r ${CONFIG_DIR}/${FNAME#function *}.conf.dist ]]
+            then
+                # check for log_healthy parameter (config file)
+                HAS_FHEALTHY=$(_CONFIG_FILE="${CONFIG_DIR}/${FNAME#function *}.conf.dist" data_get_lvalue_from_config 'log_healthy')
+                case "${HAS_FHEALTHY}" in
+                    no|NO|No)
+                        FHEALTHY="No"
+                        ;;
+                    yes|YES|Yes)
+                        FHEALTHY="Yes"
+                        ;;
+                    *)
+                        FHEALTHY="N/S"
+                        ;;
+                esac
+            else
+                FHEALTHY="N/S"          
+            fi          
+            # *.conf next
             if [[ -r ${CONFIG_DIR}/${FNAME#function *}.conf ]]
             then
                 # check for log_healthy parameter (config file)
@@ -1489,9 +1509,7 @@ do
                     *)
                         FHEALTHY="N/S"
                         ;;
-                esac
-            else
-                FHEALTHY="N/S"          
+                esac        
             fi
         # check for log_healthy support through --hc-args (plugin)
         elif (( $(grep -c -E -e "_LOG_HEALTHY" "${FFILE}" 2>/dev/null) > 0 ))