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

Add --help output for "repmgr node service"

Browse Source 
Addresses GitHub #329.
This commit is contained in:
Ian Barwick
2017-10-20 16:44:44 +09:00
parent 6852ac82c6
commit a9759cf6ca
3 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
repmgr-action-node.c
View File

@@ -36,7 +36,6 @@ static bool copy_file(const char *src_file, const char *dest_file);
static void format_archive_dir(PQExpBufferData *archive_dir);
static t_server_action parse_server_action(const char *action);
static void _do_node_service_check(void);
static void _do_node_service_list_actions(t_server_action action);
static void _do_node_status_is_shutdown_cleanly(void);
static void _do_node_archive_config(void);
@@ -1402,14 +1401,6 @@ do_node_service(void)
exit(ERR_BAD_CONFIG);
}
if (runtime_options.check == true)
{
if (action != ACTION_NONE)
log_warning(_("--action not required for --check"));
return _do_node_service_check();
}
if (runtime_options.list_actions == true)
{
return _do_node_service_list_actions(action);
@@ -1479,12 +1470,6 @@ do_node_service(void)
}
static void
_do_node_service_check(void)
{
}
static void
_do_node_service_list_actions(t_server_action action)
{
@@ -2259,4 +2244,18 @@ do_node_help(void)
" (default: /tmp)\n"));
puts("");
printf(_("NODE SERVICE\n"));
puts("");
printf(_(" \"node service\" executes a system service command to stop/start/restart/reload a node\n" \
" or optionally display which command would be executed\n"));
puts("");
printf(_(" Configuration file required, runs on local node only.\n"));
puts("");
printf(_(" --dry-run show what action would be performed, but don't execute it\n"));
printf(_(" --action action to perform (one of \"start\", \"stop\", \"restart\" or \"reload\")\n"));
printf(_(" --list-actions show what command would be performed for each action\n"));
puts("");
}

4
repmgr-client.c
View File

@@ -473,10 +473,6 @@ main(int argc, char **argv)
runtime_options.list_actions = true;
break;
case OPT_CHECK:
runtime_options.check = true;
break;
case OPT_CHECKPOINT:
runtime_options.checkpoint = true;
break;

30
repmgr-client.h
View File

@@ -66,21 +66,20 @@
#define OPT_UPSTREAM_NODE_ID 1018
#define OPT_ACTION 1019
#define OPT_LIST_ACTIONS 1020
#define OPT_CHECK 1021
#define OPT_CHECKPOINT 1022
#define OPT_IS_SHUTDOWN_CLEANLY 1023
#define OPT_ALWAYS_PROMOTE 1024
#define OPT_FORCE_REWIND 1025
#define OPT_NAGIOS 1026
#define OPT_ARCHIVE_READY 1027
#define OPT_OPTFORMAT 1028
#define OPT_REPLICATION_LAG 1029
#define OPT_CONFIG_FILES 1030
#define OPT_SIBLINGS_FOLLOW 1031
#define OPT_ROLE 1032
#define OPT_DOWNSTREAM 1033
#define OPT_SLOTS 1034
#define OPT_CONFIG_ARCHIVE_DIR 1035
#define OPT_CHECKPOINT 1021
#define OPT_IS_SHUTDOWN_CLEANLY 1022
#define OPT_ALWAYS_PROMOTE 1023
#define OPT_FORCE_REWIND 1024
#define OPT_NAGIOS 1025
#define OPT_ARCHIVE_READY 1026
#define OPT_OPTFORMAT 1027
#define OPT_REPLICATION_LAG 1028
#define OPT_CONFIG_FILES 1029
#define OPT_SIBLINGS_FOLLOW 1030
#define OPT_ROLE 1031
#define OPT_DOWNSTREAM 1032
#define OPT_SLOTS 1033
#define OPT_CONFIG_ARCHIVE_DIR 1034
/* deprecated since 3.3 */
#define OPT_DATA_DIR 999
#define OPT_NO_CONNINFO_PASSWORD 998
@@ -161,7 +160,6 @@ static struct option long_options[] =
/* "node service" options */
{"action", required_argument, NULL, OPT_ACTION},
{"check", no_argument, NULL, OPT_CHECK},
{"list-actions", no_argument, NULL, OPT_LIST_ACTIONS},
{"checkpoint", no_argument, NULL, OPT_CHECKPOINT},