Change regression test logdir parameter to work_dir and update log_directory value...

diff --git a/doc.ja/src/sgml/example-cluster.sgml b/doc.ja/src/sgml/example-cluster.sgml
index 9cbfb3ce50e885fd4d381c664fac2b32fc901f09..de7ec9958a945faf56894e9732fab295a2ed1e80 100644 (file)
--- a/doc.ja/src/sgml/example-cluster.sgml
+++ b/doc.ja/src/sgml/example-cluster.sgml
@@ -1125,7 +1125,7 @@ CIDR_NETMASK=24
    <programlisting>
 log_destination = 'stderr'
 logging_collector = on
-log_directory = '/var/log/pgpool_log'
+log_directory = '/var/log/pgpool'
 log_filename = 'pgpool-%a.log'
 log_truncate_on_rotation = on
 log_rotation_age = 1d

diff --git a/doc.ja/src/sgml/example-replication-si-mode.sgml b/doc.ja/src/sgml/example-replication-si-mode.sgml
index 6ec76c2a6d213a9b00967715259f623f9c05a7c2..2181e93e73bbb4072c569c9b44c6ac21b7a7eac3 100644 (file)
--- a/doc.ja/src/sgml/example-replication-si-mode.sgml
+++ b/doc.ja/src/sgml/example-replication-si-mode.sgml
@@ -688,7 +688,7 @@ postgres:AESHs/pWL5rtXy2IwuzroHfqg==
    <programlisting>
 log_destination = 'stderr'
 logging_collector = on
-log_directory = '/var/log/pgpool_log'
+log_directory = '/var/log/pgpool'
 log_filename = 'pgpool-%Y-%m-%d_%H%M%S.log'
 log_truncate_on_rotation = on
 log_rotation_age = 1d

diff --git a/doc/src/sgml/example-cluster.sgml b/doc/src/sgml/example-cluster.sgml
index 580626901d78ca213898d93b9d49a1d4703534ac..a731cceffe0610782afd493dd5f3d78832fdad0e 100644 (file)
--- a/doc/src/sgml/example-cluster.sgml
+++ b/doc/src/sgml/example-cluster.sgml
@@ -1203,7 +1203,7 @@ CIDR_NETMASK=24
    <programlisting>
 log_destination = 'stderr'
 logging_collector = on
-log_directory = '/var/log/pgpool_log'
+log_directory = '/var/log/pgpool'
 log_filename = 'pgpool-%a.log'
 log_truncate_on_rotation = on
 log_rotation_age = 1d

diff --git a/doc/src/sgml/example-replication-si-mode.sgml b/doc/src/sgml/example-replication-si-mode.sgml
index 2ab3aeb40438d9413284ff515cb510214673ee70..594274502d6a40615433ff6e710b2261173fac73 100644 (file)
--- a/doc/src/sgml/example-replication-si-mode.sgml
+++ b/doc/src/sgml/example-replication-si-mode.sgml
@@ -686,7 +686,7 @@ postgres:AESHs/pWL5rtXy2IwuzroHfqg==
    <programlisting>
 log_destination = 'stderr'
 logging_collector = on
-log_directory = '/var/log/pgpool_log'
+log_directory = '/var/log/pgpool'
 log_filename = 'pgpool-%Y-%m-%d_%H%M%S.log'
 log_truncate_on_rotation = on
 log_rotation_age = 1d

diff --git a/src/test/pgpool_setup.in b/src/test/pgpool_setup.in
index 926b8f8ac02df6267bb00ea5880f82b01fa1ac34..8404ad4b5f703cba3aedac59aac0a2df7b35abe7 100644 (file)
--- a/src/test/pgpool_setup.in
+++ b/src/test/pgpool_setup.in
@@ -1380,7 +1380,7 @@ chmod 0600 $PCP_PASS_FILE
 test ! -d run && mkdir run
 echo "pid_file_name = '$BASEDIR/run/pgpool.pid'" >> $CONF
 test ! -d log && mkdir log
-echo "logdir = '$BASEDIR/log'" >> $CONF
+echo "work_dir" = '$BASEDIR/log'" >> $CONF
 
 if [ "$PGPOOLDEBUG" = "true" ];then    
     echo '$PGPOOL_INSTALL_DIR/bin/pgpool -d -D -n -f $dir/etc/pgpool.conf -F $dir/etc/pcp.conf -a $dir/etc/pool_hba.conf 2>&1 | cat > $dir/log/pgpool.log &' >> $STARTALL

diff --git a/src/test/regression/tests/011.watchdog_quorum_failover/test.sh b/src/test/regression/tests/011.watchdog_quorum_failover/test.sh
index 9a5830617d412cff4f64dfec408e6bc213001584..2958d5e173475b02e678154a5545de615b0e1fa1 100755 (executable)
--- a/src/test/regression/tests/011.watchdog_quorum_failover/test.sh
+++ b/src/test/regression/tests/011.watchdog_quorum_failover/test.sh
@@ -57,7 +57,7 @@ echo -n "creating standby pgpool..."
 cat standby.conf >> $STANDBY_DIR/etc/pgpool.conf
 # since we are using the same pgpool-II conf as of leader. so change the pid file path in standby pgpool conf
 echo "pid_file_name = '$PWD/pgpool2.pid'" >> $STANDBY_DIR/etc/pgpool.conf
-echo "logdir = $STANDBY_DIR/log" >> $STANDBY_DIR/etc/pgpool.conf
+echo "work_dir = $STANDBY_DIR/log" >> $STANDBY_DIR/etc/pgpool.conf
 echo 1 > $STANDBY_DIR/etc/pgpool_node_id
 # start the standby pgpool-II by hand
 $PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY_DIR/etc/pgpool.conf -F $STANDBY_DIR/etc/pcp.conf -a $STANDBY_DIR/etc/pool_hba.conf > $STANDBY_DIR/log/pgpool.log 2>&1 &
@@ -69,7 +69,7 @@ echo -n "creating standby2 pgpool..."
 cat standby2.conf >> $STANDBY2_DIR/etc/pgpool.conf
 # since we are using the same pgpool-II conf as of leader. so change the pid file path in standby pgpool conf
 echo "pid_file_name = '$PWD/pgpool3.pid'" >> $STANDBY2_DIR/etc/pgpool.conf
-echo "logdir = $STANDBY2_DIR/log" >> $STANDBY2_DIR/etc/pgpool.conf
+echo "work_dir = $STANDBY2_DIR/log" >> $STANDBY2_DIR/etc/pgpool.conf
 echo 2 > $STANDBY2_DIR/etc/pgpool_node_id
 # start the standby pgpool-II by hand
 $PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY2_DIR/etc/pgpool.conf -F $STANDBY2_DIR/etc/pcp.conf -a $STANDBY2_DIR/etc/pool_hba.conf > $STANDBY2_DIR/log/pgpool.log 2>&1 &

diff --git a/src/test/regression/tests/012.watchdog_failover_when_quorum_exists/test.sh b/src/test/regression/tests/012.watchdog_failover_when_quorum_exists/test.sh
index ccccb86c64259d2913ee0d3228d3ec652b4e93d3..e14e181341ab58744ae83ec6d57c04d68c7eb68e 100755 (executable)
--- a/src/test/regression/tests/012.watchdog_failover_when_quorum_exists/test.sh
+++ b/src/test/regression/tests/012.watchdog_failover_when_quorum_exists/test.sh
@@ -59,7 +59,7 @@ echo -n "creating standby pgpool..."
 cat standby.conf >> $STANDBY_DIR/etc/pgpool.conf
 # since we are using the same pgpool-II conf as of leader. so change the pid file path in standby pgpool conf
 echo "pid_file_name = '$PWD/pgpool2.pid'" >> $STANDBY_DIR/etc/pgpool.conf
-echo "logdir = $STANDBY_DIR/log" >> $STANDBY_DIR/etc/pgpool.conf
+echo "work_dir = $STANDBY_DIR/log" >> $STANDBY_DIR/etc/pgpool.conf
 echo 1 > $STANDBY_DIR/etc/pgpool_node_id
 # start the standby pgpool-II by hand
 #$PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY_DIR/etc/pgpool.conf -F $STANDBY_DIR/etc/pcp.conf -a $STANDBY_DIR/etc/pool_hba.conf > $STANDBY_DIR/log/pgpool.log 2>&1 &
@@ -71,7 +71,7 @@ echo -n "creating standby2 pgpool..."
 cat standby2.conf >> $STANDBY2_DIR/etc/pgpool.conf
 # since we are using the same pgpool-II conf as of leader. so change the pid file path in standby pgpool conf
 echo "pid_file_name = '$PWD/pgpool3.pid'" >> $STANDBY2_DIR/etc/pgpool.conf
-echo "logdir = $STANDBY2_DIR/log" >> $STANDBY2_DIR/etc/pgpool.conf
+echo "work_dir = $STANDBY2_DIR/log" >> $STANDBY2_DIR/etc/pgpool.conf
 echo 2 > $STANDBY2_DIR/etc/pgpool_node_id
 # start the standby pgpool-II by hand
 #$PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY2_DIR/etc/pgpool.conf -F $STANDBY2_DIR/etc/pcp.conf -a $STANDBY2_DIR/etc/pool_hba.conf > $STANDBY2_DIR/log/pgpool.log 2>&1 &

diff --git a/src/test/regression/tests/013.watchdog_failover_require_consensus/test.sh b/src/test/regression/tests/013.watchdog_failover_require_consensus/test.sh
index d74a827e9ff7e315098cd47ec1ac3db3ded1d06f..b51af66a36d952a8f1246feee86f225d959d271c 100755 (executable)
--- a/src/test/regression/tests/013.watchdog_failover_require_consensus/test.sh
+++ b/src/test/regression/tests/013.watchdog_failover_require_consensus/test.sh
@@ -59,7 +59,7 @@ echo -n "creating standby pgpool..."
 cat standby.conf >> $STANDBY_DIR/etc/pgpool.conf
 # since we are using the same pgpool-II conf as of leader. so change the pid file path in standby pgpool conf
 echo "pid_file_name = '$PWD/pgpool2.pid'" >> $STANDBY_DIR/etc/pgpool.conf
-echo "logdir = $STANDBY_DIR/log" >> $STANDBY_DIR/etc/pgpool.conf
+echo "work_dir = $STANDBY_DIR/log" >> $STANDBY_DIR/etc/pgpool.conf
 echo 1 > $STANDBY_DIR/etc/pgpool_node_id
 # start the standby pgpool-II by hand
 $PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY_DIR/etc/pgpool.conf -F $STANDBY_DIR/etc/pcp.conf -a $STANDBY_DIR/etc/pool_hba.conf > $STANDBY_DIR/log/pgpool.log 2>&1 &
@@ -70,7 +70,7 @@ echo -n "creating standby2 pgpool..."
 cat standby2.conf >> $STANDBY2_DIR/etc/pgpool.conf
 # since we are using the same pgpool-II conf as of leader. so change the pid file path in standby pgpool conf
 echo "pid_file_name = '$PWD/pgpool3.pid'" >> $STANDBY2_DIR/etc/pgpool.conf
-echo "logdir = $STANDBY2_DIR/log" >> $STANDBY2_DIR/etc/pgpool.conf
+echo "work_dir = $STANDBY2_DIR/log" >> $STANDBY2_DIR/etc/pgpool.conf
 echo 2 > $STANDBY2_DIR/etc/pgpool_node_id
 # start the standby pgpool-II by hand
 $PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY2_DIR/etc/pgpool.conf -F $STANDBY2_DIR/etc/pcp.conf -a $STANDBY2_DIR/etc/pool_hba.conf > $STANDBY2_DIR/log/pgpool.log 2>&1 &

diff --git a/src/test/regression/tests/015.watchdog_master_and_backend_fail/test.sh b/src/test/regression/tests/015.watchdog_master_and_backend_fail/test.sh
index 3b517a98d9b1f752cef1c07a34e6dfdf04be2d5e..f0dad0766c97564da2db28e84356e2afe5795682 100755 (executable)
--- a/src/test/regression/tests/015.watchdog_master_and_backend_fail/test.sh
+++ b/src/test/regression/tests/015.watchdog_master_and_backend_fail/test.sh
@@ -59,7 +59,7 @@ echo -n "creating standby pgpool..."
 cat standby.conf >> $STANDBY_DIR/etc/pgpool.conf
 # since we are using the same pgpool-II conf as of leader. so change the pid file path in standby pgpool conf
 echo "pid_file_name = '$PWD/pgpool2.pid'" >> $STANDBY_DIR/etc/pgpool.conf
-echo "logdir = $STANDBY_DIR/log" >> $STANDBY_DIR/etc/pgpool.conf
+echo "work_dir = $STANDBY_DIR/log" >> $STANDBY_DIR/etc/pgpool.conf
 echo 1 > $STANDBY_DIR/etc/pgpool_node_id
 # start the standby pgpool-II by hand
 $PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY_DIR/etc/pgpool.conf -F $STANDBY_DIR/etc/pcp.conf -a $STANDBY_DIR/etc/pool_hba.conf > $STANDBY_DIR/log/pgpool.log 2>&1 &
@@ -70,7 +70,7 @@ echo -n "creating standby2 pgpool..."
 cat standby2.conf >> $STANDBY2_DIR/etc/pgpool.conf
 # since we are using the same pgpool-II conf as of leader. so change the pid file path in standby pgpool conf
 echo "pid_file_name = '$PWD/pgpool3.pid'" >> $STANDBY2_DIR/etc/pgpool.conf
-echo "logdir = $STANDBY2_DIR/log" >> $STANDBY2_DIR/etc/pgpool.conf
+echo "work_dir = $STANDBY2_DIR/log" >> $STANDBY2_DIR/etc/pgpool.conf
 echo 2 > $STANDBY2_DIR/etc/pgpool_node_id
 # start the standby pgpool-II by hand
 $PGPOOL_INSTALL_DIR/bin/pgpool -D -n -f $STANDBY2_DIR/etc/pgpool.conf -F $STANDBY2_DIR/etc/pcp.conf -a $STANDBY2_DIR/etc/pool_hba.conf > $STANDBY2_DIR/log/pgpool.log 2>&1 &