diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-01-08 01:14:36 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-01-08 01:14:36 +0300 |
| commit | 5f9ab868ac7bc111c2d8aeafcde459844e129ebc (patch) | |
| tree | 421e6abf10c5bd26d2dcf874e028ff44c1983a9a | |
| parent | bcd5958a4a46cebcf50a3450a047301d8a0fecc5 (diff) | |
| parent | 03fd0c2d35e82ed02c9fe615502e6b78c6ee9a1b (diff) | |
| download | rabbitmq-server-git-5f9ab868ac7bc111c2d8aeafcde459844e129ebc.tar.gz | |
Merge branch 'stable'
| -rwxr-xr-x | scripts/rabbitmq-server-ha.ocf | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf index 5f338211d6..6cec4f1864 100755 --- a/scripts/rabbitmq-server-ha.ocf +++ b/scripts/rabbitmq-server-ha.ocf @@ -933,16 +933,12 @@ stop_server_process() { # Try to stop gracefully by known PID ocf_log info "${LH} Execute stop with timeout: ${TIMEOUT_ARG}" su_rabbit_cmd "${OCF_RESKEY_ctl} stop ${OCF_RESKEY_pid_file} 2>&1 >> \"${OCF_RESKEY_log_dir}/shutdown_log\"" - if [ $? -eq 0 ] ; then - ocf_log info "${LH} RMQ-server process (PID=${pid}) stopped succesfully." - ocf_log info "${LH} grant a graceful termintation window ${OCF_RESKEY_stop_time} to end its beam and remove pidfile" - sleep "${OCF_RESKEY_stop_time}" - fi + [ $? -eq 0 ] && ocf_log info "${LH} RMQ-server process (PID=${pid}) stopped succesfully." fi if [ -f ${OCF_RESKEY_pid_file} ] ; then # Ensure there is no beam process and pidfile left - ocf_log warn "${LH} Cannot be stopped, forcing the RMQ-server process termination" + ocf_log warn "${LH} The pidfile still exists, forcing the RMQ-server cleanup" kill_rmq_and_remove_pid fi |