From e1371a308dc636ecf52c1a290f089f57a9d27f5b Mon Sep 17 00:00:00 2001
From: Bitnami Bot <containers-bot@bitnami.com>
Date: Sat, 19 Oct 2019 02:50:48 +0000
Subject: [PATCH] 4.0.6-ol-7-r52 release

---
 bitnami/pgpool/4/ol-7/Dockerfile          |  4 ++--
 bitnami/pgpool/4/ol-7/rootfs/libpgpool.sh | 14 +++-----------
 bitnami/pgpool/README.md                  |  2 +-
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/bitnami/pgpool/4/ol-7/Dockerfile b/bitnami/pgpool/4/ol-7/Dockerfile
index 034ed3bee760..0a792fa44e75 100644
--- a/bitnami/pgpool/4/ol-7/Dockerfile
+++ b/bitnami/pgpool/4/ol-7/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/oraclelinux-extras-base:7-r451
+FROM bitnami/oraclelinux-extras-base:7-r452
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 ENV OS_ARCH="x86_64" \
@@ -13,7 +13,7 @@ RUN . ./libcomponent.sh && component_unpack "pgpool" "4.0.6-1" --checksum 18034b
 COPY rootfs /
 RUN /postunpack.sh
 ENV BITNAMI_APP_NAME="pgpool" \
-    BITNAMI_IMAGE_VERSION="4.0.6-ol-7-r51" \
+    BITNAMI_IMAGE_VERSION="4.0.6-ol-7-r52" \
     PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/pgpool/bin:$PATH"
 
 EXPOSE 5432
diff --git a/bitnami/pgpool/4/ol-7/rootfs/libpgpool.sh b/bitnami/pgpool/4/ol-7/rootfs/libpgpool.sh
index 8b3bcf0d72be..477b1bca062d 100644
--- a/bitnami/pgpool/4/ol-7/rootfs/libpgpool.sh
+++ b/bitnami/pgpool/4/ol-7/rootfs/libpgpool.sh
@@ -208,7 +208,6 @@ pgpool_set_property() {
 #   None
 #########################
 pgpool_create_backend_config() {
-    local return_value=1
     local -r node=${1:?node is missing}
 
     # default values
@@ -231,11 +230,10 @@ backend_weight$num = $weight
 backend_data_directory$num = '$dir'
 backend_flag$num = '$flag'
 EOF
-        return_value=0
     else
-        warn "Backend $host did not respond after $PGPOOL_TIMEOUT seconds!"
+        error "Backend $host did not respond after $PGPOOL_TIMEOUT seconds!"
+        exit 1
     fi
-    return $return_value
 }
 
 ########################
@@ -296,14 +294,8 @@ pgpool_create_config() {
     # Backend settings
     read -r -a nodes <<< "$(tr ',;' ' ' <<< "${PGPOOL_BACKEND_NODES}")"
     for node in "${nodes[@]}"; do
-        pgpool_create_backend_config "$node" && node_counter+=1
+        pgpool_create_backend_config "$node"
     done
-
-    if [[ $node_counter -ne ${#nodes[@]} ]]; then
-        error "Not enough active nodes. $node_counter node(s) found, ${#nodes[@]} needed"
-    else
-        info "$node_counter node(s) were found, ${#nodes[@]} needed"
-    fi
 }
 
 ########################
diff --git a/bitnami/pgpool/README.md b/bitnami/pgpool/README.md
index 1d3a5ab12a45..7025ba945a29 100644
--- a/bitnami/pgpool/README.md
+++ b/bitnami/pgpool/README.md
@@ -39,7 +39,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`4-ol-7`, `4.0.6-ol-7-r51` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-ol-7-r51/4/ol-7/Dockerfile)
+* [`4-ol-7`, `4.0.6-ol-7-r52` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-ol-7-r52/4/ol-7/Dockerfile)
 * [`4-debian-9`, `4.0.6-debian-9-r48`, `4`, `4.0.6`, `4.0.6-r48`, `latest` (4/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-debian-9-r48/4/debian-9/Dockerfile)
 * [`4-centos-7`, `4.0.6-centos-7-r50` (4/centos-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-centos-7-r50/4/centos-7/Dockerfile)