From 41b232e6b54c746bd5b6974d4384c893bbb1e828 Mon Sep 17 00:00:00 2001 From: Haruka harukat Date: Sun, 7 Nov 2010 20:50:57 +0000 Subject: [PATCH] * fix bug in pgpool.monitor arguments. --- ChangeLog | 5 ++++- doc/pgpool-ha.en.txt | 2 +- src/pgpool.in | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d7b4a2..afcb2be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2010/11/8 + * fix bug in pgpool.monitor arguments. + 2010/1/18 * add "pgpooluser" parameter @@ -7,7 +10,7 @@ * renew sample cib.xml tested on heartbeat 2.1.4, pgpool-II 2.1 * pipe expression was able to be used at "logfile" * make pgpool.in always use "pgpool stop -m immediate" to (stop) - * add "options" parameter + * add "options" parameter 2007/6/XX release 1.1 * fix ocf script to work properly with pgpool 3.2+ . diff --git a/doc/pgpool-ha.en.txt b/doc/pgpool-ha.en.txt index 55ef2d6..1c6320d 100644 --- a/doc/pgpool-ha.en.txt +++ b/doc/pgpool-ha.en.txt @@ -15,7 +15,7 @@ This software contains: 2. Requirement - heartbeat - 2.0+ required. (Tested on 2.1.4 only) + 2.0+ required. - pgpool Tested on pgpool-II only , but It will work if 'show pool_status' command diff --git a/src/pgpool.in b/src/pgpool.in index 95c85ad..0ae707b 100755 --- a/src/pgpool.in +++ b/src/pgpool.in @@ -4,7 +4,7 @@ # # Author: TANIDA Yutaka, TAKATSUKA Haruka # -# Copyright (c) 2006-2009 PgPool Global Development Group +# Copyright (c) 2006-2010 PgPool Global Development Group # # Permission to use, copy, modify, and distribute this software and # its documentation for any purpose and without fee is hereby @@ -96,7 +96,7 @@ fi PGPOOL_STOP_ARG=" stop" PGPOOL_FORCE_STOP_ARG=" -m i $PGPOOL_STOP_ARG" PGPOOL_MONITOR=${PGPOOLCMD}.monitor -PGPOOL_MONITOR_ARGS=--conf=$PGP_CONF localhost >/dev/null 2>&1 +PGPOOL_MONITOR_ARGS="--conf=$PGP_CONF localhost >/dev/null 2>&1" # Source function library. . ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs -- 2.39.5