1. Removed checking for PostgreSQL process name so it should be
compatible with PostgreSQL 8.2
2. Added pghost parameter that allows to monitor PostgreSQL on a give
IP Address.
--- resources/OCF/pgsql.in.distr 2006-10-04 23:02:19.000000000 -0400
+++ resources/OCF/pgsql.in 2006-10-04 23:16:58.000000000 -0400
@@ -14,6 +14,7 @@
# OCF_RESKEY_psql - Path to psql. Default is /usr/bin/psql
# OCF_RESKEY_pgdata - PGDATA directory. Default is /var/lib/pgsql/data
# OCF_RESKEY_pgdba - userID that manages DB. Default is postgres
+# OCF_RESKEY_pghost - Host/IP Address where PostgreSQL is listening
# OCF_RESKEY_pgdb - database to monitor. Default is template1
# OCF_RESKEY_logfile - Path to PostgreSQL log file. Default is /dev/null
###############################################################################
@@ -90,6 +91,13 @@
<shortdesc lang="en">pgdba</shortdesc>
<content type="string" default="postgres" />
</parameter>
+<parameter name="pghost" unique="0" required="0">
+<longdesc lang="en">
+Hostname/IP Addreess where PosrgeSQL is listening
+</longdesc>
+<shortdesc lang="en">pghost</shortdesc>
+<content type="string" default="" />
+</parameter>
<parameter name="pgdb" unique="0" required="0">
<longdesc lang="en">
Database that will be used for monitoring.
@@ -214,7 +222,7 @@
if [ -f $PIDFILE ]
then
PID=`head -n 1 $PIDFILE`
- process_running $PID && [ `ps -p $PID | grep postmaster | wc -l` -eq 1
]
+ process_running $PID
else
: No pid file
false
@@ -239,8 +247,13 @@
ocf_log info "PostgreSQL is down"
return $OCF_NOT_RUNNING
fi
-
- $PSQL -U $PGDBA $PGDB -c 'select now();' >/dev/null 2>&1
+
+ if [ -z $PGHOST ]
+ then
+ $PSQL -U $PGDBA $PGDB -c 'select now();' >/dev/null 2>&1
+ else
+ $PSQL -h $PGHOST -U $PGDBA $PGDB -c 'select now();' >/dev/null 2>&1
+ fi
if [ $? -ne 0 ]
then
@@ -313,6 +326,7 @@
PSQL=${OCF_RESKEY_psql:-/usr/bin/psql}
PGDATA=${OCF_RESKEY_pgdata:-/var/lib/pgsql/data}
PGDBA=${OCF_RESKEY_pgdba:-postgres}
+PGHOST=${OCF_RESKEY_pghost:-""}
PGDB=${OCF_RESKEY_pgdb:-template1}
LOGFILE=${OCF_RESKEY_logfile:-/dev/null}
PIDFILE=${PGDATA}/postmaster.pid
_______________________________________________________
Linux-HA-Dev: [email protected]
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
