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

Standardize configuration error messages for 'failover' parameter.

Browse Source 
Better to fail with an error than assume a default value if an
unrecognized value is detected.
This commit is contained in:
Ian Barwick
2015-03-17 08:19:29 +09:00
parent 155f5075cb
commit e21448831d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config.c
View File

@@ -180,13 +180,17 @@ parse_config(const char *config_file, t_configuration_options *options)
strncpy(failoverstr, value, MAXLEN); strncpy(failoverstr, value, MAXLEN);
if (strcmp(failoverstr, "manual") == 0) if (strcmp(failoverstr, "manual") == 0)
{
options->failover = MANUAL_FAILOVER; options->failover = MANUAL_FAILOVER;
}
else if (strcmp(failoverstr, "automatic") == 0) else if (strcmp(failoverstr, "automatic") == 0)
{
options->failover = AUTOMATIC_FAILOVER; options->failover = AUTOMATIC_FAILOVER;
}
else else
{ {
log_warning(_("Value for failover option is incorrect, it should be 'automatic' or 'manual'. Defaulting to manual.\n")); log_err(_("value for 'failover' must be 'automatic' or 'manual'\n"));
options->failover = MANUAL_FAILOVER; exit(ERR_BAD_CONFIG);
} }
} }
else if (strcmp(name, "priority") == 0) else if (strcmp(name, "priority") == 0)
@@ -394,7 +398,7 @@ reload_config(char *config_file, t_configuration_options * orig_options)
if (new_options.failover != MANUAL_FAILOVER && new_options.failover != AUTOMATIC_FAILOVER) if (new_options.failover != MANUAL_FAILOVER && new_options.failover != AUTOMATIC_FAILOVER)
{ {
log_warning(_("new value for 'failover' must be MANUAL or AUTOMATIC\n")); log_warning(_("new value for 'failover' must be 'automatic' or 'manual'\n"));
return false; return false;
} }