From 2697416f13b0f405c4eb5cbbbcbbab411a8aefdf Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Sat, 19 Oct 2019 01:31:06 +0000 Subject: [PATCH] 4.0.6-debian-9-r48 release --- bitnami/pgpool/4/debian-9/Dockerfile | 2 +- bitnami/pgpool/4/debian-9/rootfs/libpgpool.sh | 14 +++----------- bitnami/pgpool/README.md | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/bitnami/pgpool/4/debian-9/Dockerfile b/bitnami/pgpool/4/debian-9/Dockerfile index 71a65d4d8347..321cd4cc1ead 100644 --- a/bitnami/pgpool/4/debian-9/Dockerfile +++ b/bitnami/pgpool/4/debian-9/Dockerfile @@ -13,7 +13,7 @@ RUN . ./libcomponent.sh && component_unpack "pgpool" "4.0.6-1" --checksum 57b281 COPY rootfs / RUN /postunpack.sh ENV BITNAMI_APP_NAME="pgpool" \ - BITNAMI_IMAGE_VERSION="4.0.6-debian-9-r47" \ + BITNAMI_IMAGE_VERSION="4.0.6-debian-9-r48" \ PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/pgpool/bin:$PATH" EXPOSE 5432 diff --git a/bitnami/pgpool/4/debian-9/rootfs/libpgpool.sh b/bitnami/pgpool/4/debian-9/rootfs/libpgpool.sh index 8b3bcf0d72be..477b1bca062d 100644 --- a/bitnami/pgpool/4/debian-9/rootfs/libpgpool.sh +++ b/bitnami/pgpool/4/debian-9/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 d94f28767410..1d3a5ab12a45 100644 --- a/bitnami/pgpool/README.md +++ b/bitnami/pgpool/README.md @@ -40,7 +40,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t * [`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-debian-9`, `4.0.6-debian-9-r47`, `4`, `4.0.6`, `4.0.6-r47`, `latest` (4/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-pgpool/blob/4.0.6-debian-9-r47/4/debian-9/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) Subscribe to project updates by watching the [bitnami/pgpool GitHub repo](https://github.com/bitnami/bitnami-docker-pgpool).