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

Suppress warning about -w/--wal-keep-segments unless actually specified

Browse Source 
Already implemented in HEAD.
This commit is contained in:
Ian Barwick
2016-01-05 13:16:38 +09:00
parent 0de4260664
commit 4f849de95e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
repmgr.c
View File

@@ -113,6 +113,8 @@ static bool config_file_required = true;
/* Initialization of runtime options */ /* Initialization of runtime options */
t_runtime_options runtime_options = T_RUNTIME_OPTIONS_INITIALIZER; t_runtime_options runtime_options = T_RUNTIME_OPTIONS_INITIALIZER;
t_configuration_options options = T_CONFIGURATION_OPTIONS_INITIALIZER; t_configuration_options options = T_CONFIGURATION_OPTIONS_INITIALIZER;
static bool wal_keep_segments_used = false;
static char *server_mode = NULL; static char *server_mode = NULL;
static char *server_cmd = NULL; static char *server_cmd = NULL;
@@ -164,7 +166,6 @@ main(int argc, char **argv)
int c, targ; int c, targ;
int action = NO_ACTION; int action = NO_ACTION;
bool check_upstream_config = false; bool check_upstream_config = false;
bool wal_keep_segments_used = false;
bool config_file_parsed = false; bool config_file_parsed = false;
char *ptr = NULL; char *ptr = NULL;
@@ -3136,7 +3137,7 @@ check_parameters_for_action(const int action)
error_list_append(&cli_warnings, _("-r/--rsync-only can only be used when executing STANDBY CLONE")); error_list_append(&cli_warnings, _("-r/--rsync-only can only be used when executing STANDBY CLONE"));
} }
if (runtime_options.wal_keep_segments) if (wal_keep_segments_used)
{ {
error_list_append(&cli_warnings, _("-w/--wal-keep-segments can only be used when executing STANDBY CLONE")); error_list_append(&cli_warnings, _("-w/--wal-keep-segments can only be used when executing STANDBY CLONE"));
} }