add "pkill -P 1 pgpool" when missing pgpool main process at stop-action

diff --git a/ChangeLog b/ChangeLog
index afcb2be6a6c2c37a6cebf620670e1864d8a03199..07bc2f02f122ff87f832478368017eb8a2a66aad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012/02/17
+    * add "pkill -P 1 pgpool" when missing pgpool main process at stop-action
+
+2010/12/1
+       * add monitor_ip option
+       * modify code indent
+       * remove comment out code
+
 2010/11/8
        * fix bug in pgpool.monitor arguments.
 

diff --git a/src/pgpool.in b/src/pgpool.in
index 2770efa8a6d0d74777539b9d468946689977e4a4..f70599646bef0030c290fa8fa996403694704a8f 100755 (executable)
--- a/src/pgpool.in
+++ b/src/pgpool.in
@@ -4,7 +4,7 @@
 #
 # Author: TANIDA Yutaka, TAKATSUKA Haruka
 #
-# Copyright (c) 2006-2010           PgPool Global Development Group 
+# Copyright (c) 2006-2012           PgPool Global Development Group 
 #
 # Permission to use, copy, modify, and distribute this software and
 # its documentation for any purpose and without fee is hereby
@@ -132,6 +132,12 @@ case "$1" in
                fi
        else
                ocf_log info "pgpoolRA: request stop, but not running."
+               if which pkill ; then
+                       if pkill -P 1 pgpool ; then
+                               ocf_log info "pgpoolRA: purge orphaned pgpool processes."
+                               sleep 1
+                       fi
+               fi
                exit 0 
        fi
        ;;