From: Tatsuo Ishii <ishii@postgresql.org>
Date: Fri, 22 Aug 2025 06:35:48 +0000 (+0900)
Subject: Fix watchdog_setup bug.
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=384c17eaba1dad802c9f81b4057ba6ce76417e2d;p=pgpool2.git

Fix watchdog_setup bug.

Fix bug in commit 534e04a0e.

- If no argument is specified, watchdog_setup complains a shell script error.
- When VIP is requested, delegate_ip, if_up_cmd and if_up_cmd are
  added to pgpool.conf multiple times.

Reviewed-by: Bo Peng <pengbo@sraoss.co.jp
Author: Tatsuo Ishii <ishii@postgresql.org>
---

diff --git a/src/test/watchdog_setup.in b/src/test/watchdog_setup.in
index dfa362471..c64152451 100644
--- a/src/test/watchdog_setup.in
+++ b/src/test/watchdog_setup.in
@@ -199,15 +199,16 @@ EOF
 		echo "wd_port$n = $wd_port" >> $conf
 		echo "heartbeat_hostname$n = 'localhost'" >> $conf
 		echo "heartbeat_port$n = $wd_heartbeat_port" >> $conf
-		if [ $VIP != "" ];then
-		    echo "delegate_ip = '$VIP'" >> $conf
-		    echo "if_up_cmd = '/usr/bin/echo \"if_up_cmd executed\"'" >> $conf
-		    echo "if_down_cmd = 'usr/bin/echo \"if_down_cmd executed\"'" >> $conf
-		    echo "arping_cmd = '/usr/bin/true'" >> $conf
-		fi
 		n=`expr $n + 1`
     done
 
+    if [ "$VIP" != "" ];then
+	echo "delegate_ip = '$VIP'" >> $conf
+	echo "if_up_cmd = '/usr/bin/echo \"if_up_cmd executed\"'" >> $conf
+	echo "if_down_cmd = 'usr/bin/echo \"if_down_cmd executed\"'" >> $conf
+	echo "arping_cmd = '/usr/bin/true'" >> $conf
+    fi
+
 	echo "$id" >> $node_id_file
 }