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

Fix merge error that removed setting keywords

Browse Source
This commit is contained in:
Greg Smith
2011-02-15 00:55:50 -05:00
parent 45022debc6
commit 757457ad85
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
repmgr.c
View File

@@ -243,33 +243,40 @@ main(int argc, char **argv)
strncpy(runtime_options.dbname, DEFAULT_DBNAME, MAXLEN); strncpy(runtime_options.dbname, DEFAULT_DBNAME, MAXLEN);
} }
/* /* Read the configuration file: repmgr.conf */
* Read the configuration file: repmgr.conf, but only if we're not doing a if (!runtime_options.config_file[0])
* STANDBY CLONE action: it is not necessary to have the configuration file strncpy(runtime_options.config_file, DEFAULT_CONFIG_FILE, MAXLEN);
* in that case.
if (runtime_options.verbose)
printf(_("Opening configuration file: %s\n"), runtime_options.config_file);
parse_config(runtime_options.config_file, &options);
keywords[2] = "user";
values[2] = runtime_options.username;
keywords[3] = "dbname";
values[3] = runtime_options.dbname;
keywords[4] = "application_name";
values[4] = (char *) progname;
keywords[5] = NULL;
values[5] = NULL;
logger_init(progname, options.loglevel, options.logfacility);
/*
* Node configuration information is not needed for all actions,
* with STANDBY CLONE being the main exception.
*/ */
if (action != STANDBY_CLONE)
{
if (runtime_options.verbose)
printf(_("Opening configuration file: %s\n"), runtime_options.config_file);
parse_config(runtime_options.config_file, &options);
}
if (need_a_node) if (need_a_node)
{ {
if (options.node == -1) if (options.node == -1)
{ {
log_err("Node information is missing. " log_err("Node information is missing. "
"Check the configuration file.\n"); "Check the configuration file.\n");
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
} }
logger_init(progname, options.loglevel, options.logfacility);
/* Prepare the repmgr schema variable */ /* Prepare the repmgr schema variable */
snprintf(repmgr_schema, MAXLEN, "%s%s", DEFAULT_REPMGR_SCHEMA_PREFIX, options.cluster_name); snprintf(repmgr_schema, MAXLEN, "%s%s", DEFAULT_REPMGR_SCHEMA_PREFIX, options.cluster_name);