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

Remove superfluous configuration check

Browse Source 
Also add note about configuration parsing failure and event logging.
This commit is contained in:
Ian Barwick
2015-03-17 18:41:17 +09:00
parent 4b3966d6a7
commit 9e2736be4c
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
repmgrd.c
View File

@@ -201,17 +201,16 @@ main(int argc, char **argv)
}
/*
* Read the configuration file: repmgr.conf
* Parse the configuration file, if provided. If no configuration file
* was provided, or one was but was incomplete, parse_config() will
* abort anyway, with an appropriate message.
*
* XXX it might be desirable to create an event record for this, in
* which case we'll need to refactor parse_config() not to abort,
* and return the error message.
*/
parse_config(config_file, &local_options);
if (local_options.node == -1)
{
log_err(_("Node information is missing. "
"Check the configuration file, or provide one if you have not done so.\n"));
terminate(ERR_BAD_CONFIG);
}
if (daemonize)
{
do_daemonize();
@@ -1940,7 +1939,7 @@ terminate(int retval)
unlink(pid_file);
}
log_info("Terminating...\n");
log_info(_("%s terminating...\n"), progname);
exit(retval);
}