github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 00:26:30 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

"daemon stop": be careful with hints about "daemon status"

Browse Source 
If PostgreSQL is not running, "repmgr daemon status" can't be executed.
This commit is contained in:
Ian Barwick
2019-01-30 14:49:43 +09:00
parent d7420d7274
commit d4ee4cc14c
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
repmgr-action-daemon.c
View File

@@ -524,6 +524,7 @@ void do_daemon_stop(void)
PQExpBufferData repmgrd_command; PQExpBufferData repmgrd_command;
PQExpBufferData output_buf; PQExpBufferData output_buf;
bool success; bool success;
bool have_db_connection = true;
pid_t pid = UNKNOWN_PID; pid_t pid = UNKNOWN_PID;
if (config_file_options.repmgrd_service_stop_command[0] == '\0') if (config_file_options.repmgrd_service_stop_command[0] == '\0')
@@ -547,6 +548,7 @@ void do_daemon_stop(void)
* a PostgreSQL connection is not required to stop repmgrd, * a PostgreSQL connection is not required to stop repmgrd,
*/ */
log_warning(_("unable to connect to local node")); log_warning(_("unable to connect to local node"));
have_db_connection = false;
} }
else else
{ {
@@ -598,7 +600,8 @@ void do_daemon_stop(void)
if (runtime_options.no_wait == true || runtime_options.wait == 0) if (runtime_options.no_wait == true || runtime_options.wait == 0)
{ {
log_hint(REPMGR_DAEMON_STATUS_STOP_HINT); if (have_db_connection == true)
log_hint(REPMGR_DAEMON_STATUS_STOP_HINT);
} }
else else
{ {
@@ -616,7 +619,10 @@ void do_daemon_stop(void)
* if PID still unknown, exit here * if PID still unknown, exit here
*/ */
log_warning(_("unable to determine repmgrd PID")); log_warning(_("unable to determine repmgrd PID"));
log_hint(REPMGR_DAEMON_STATUS_STOP_HINT);
if (have_db_connection == true)
log_hint(REPMGR_DAEMON_STATUS_STOP_HINT);
exit(ERR_REPMGRD_SERVICE); exit(ERR_REPMGRD_SERVICE);
} }
@@ -645,7 +651,10 @@ void do_daemon_stop(void)
{ {
log_error(_("repmgrd does not appear to have stopped after %i seconds"), log_error(_("repmgrd does not appear to have stopped after %i seconds"),
timeout); timeout);
log_hint(REPMGR_DAEMON_STATUS_START_HINT);
if (have_db_connection == true)
log_hint(REPMGR_DAEMON_STATUS_START_HINT);
exit(ERR_REPMGRD_SERVICE); exit(ERR_REPMGRD_SERVICE);
} }