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

Explicitly specify problematic parameter names in error messages.

Browse Source
This commit is contained in:
Ian Barwick
2015-03-13 11:46:06 +09:00
parent 36db199882
commit 33037dd7fb
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config.c
View File

@@ -234,40 +234,42 @@ parse_config(const char *config_file, t_configuration_options *options)
log_err(_("No value provided for parameter '%s'. Check the configuration file.\n"), name); log_err(_("No value provided for parameter '%s'. Check the configuration file.\n"), name);
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
} }
/* Close file */ /* Close file */
fclose(fp); fclose(fp);
/* Check config settings */ /* Check config settings */
/* The following checks are for the presence of the parameter */
if (*options->cluster_name == '\0') if (*options->cluster_name == '\0')
{ {
log_err(_("Cluster name was not found. Check the configuration file.\n")); log_err(_("Parameter 'cluster' was not found. Check the configuration file.\n"));
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
if (options->node == -1) if (options->node == -1)
{ {
log_err(_("Node id was not found. Check the configuration file.\n")); log_err(_("Parameter 'node' was not found. Check the configuration file.\n"));
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
/* The following checks are for value parameter values */
if (options->master_response_timeout <= 0) if (options->master_response_timeout <= 0)
{ {
log_err(_("Master response timeout must be greater than zero. Check the configuration file.\n")); log_err(_("'master_response_timeout' must be greater than zero. Check the configuration file.\n"));
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
if (options->reconnect_attempts < 0) if (options->reconnect_attempts < 0)
{ {
log_err(_("Reconnect attempts must be zero or greater. Check the configuration file.\n")); log_err(_("'reconnect_attempts' must be zero or greater. Check the configuration file.\n"));
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
if (options->reconnect_intvl <= 0) if (options->reconnect_intvl <= 0)
{ {
log_err(_("Reconnect intervals must be zero or greater. Check the configuration file.\n")); log_err(_("'reconnect_intervals' must be zero or greater. Check the configuration file.\n"));
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }