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

Update configfile location logging output

Browse Source
This commit is contained in:
Ian Barwick
2017-09-11 22:13:52 +09:00
parent cf59944a35
commit 13d55b9bd8
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
configfile.c
View File

@@ -115,6 +115,8 @@ load_config(const char *config_file, bool verbose, bool terse, t_configuration_o
/* 1. location provided by packager */ /* 1. location provided by packager */
if (package_conf_file[0] != '\0') if (package_conf_file[0] != '\0')
{ {
log_verbose(LOG_INFO, _("checking for package configuration file \"%s\""), package_conf_file);
if (stat(package_conf_file, &stat_config) == 0) if (stat(package_conf_file, &stat_config) == 0)
{ {
strncpy(config_file_path, package_conf_file, MAXPGPATH); strncpy(config_file_path, package_conf_file, MAXPGPATH);
@@ -124,10 +126,7 @@ load_config(const char *config_file, bool verbose, bool terse, t_configuration_o
} }
/* 2 "./repmgr.conf" */ /* 2 "./repmgr.conf" */
if (verbose == true) log_verbose(LOG_INFO, _("looking for configuration file in current directory"));
{
log_notice(_("looking for configuration file in current directory"));
}
maxpath_snprintf(config_file_path, "./%s", CONFIG_FILE_NAME); maxpath_snprintf(config_file_path, "./%s", CONFIG_FILE_NAME);
canonicalize_path(config_file_path); canonicalize_path(config_file_path);
@@ -139,10 +138,7 @@ load_config(const char *config_file, bool verbose, bool terse, t_configuration_o
} }
/* 3. "/etc/repmgr.conf" */ /* 3. "/etc/repmgr.conf" */
if (verbose == true) log_verbose(LOG_INFO, _("looking for configuration file in /etc"));
{
log_notice(_("looking for configuration file in /etc"));
}
maxpath_snprintf(config_file_path, "/etc/%s", CONFIG_FILE_NAME); maxpath_snprintf(config_file_path, "/etc/%s", CONFIG_FILE_NAME);
if (stat(config_file_path, &stat_config) == 0) if (stat(config_file_path, &stat_config) == 0)
@@ -160,10 +156,7 @@ load_config(const char *config_file, bool verbose, bool terse, t_configuration_o
get_etc_path(my_exec_path, sysconf_etc_path); get_etc_path(my_exec_path, sysconf_etc_path);
if (verbose == true) log_verbose(LOG_INFO, _("looking for configuration file in %s"), sysconf_etc_path);
{
log_notice(_("looking for configuration file in %s"), sysconf_etc_path);
}
maxpath_snprintf(config_file_path, "%s/%s", sysconf_etc_path, CONFIG_FILE_NAME); maxpath_snprintf(config_file_path, "%s/%s", sysconf_etc_path, CONFIG_FILE_NAME);
if (stat(config_file_path, &stat_config) == 0) if (stat(config_file_path, &stat_config) == 0)
@@ -175,17 +168,11 @@ load_config(const char *config_file, bool verbose, bool terse, t_configuration_o
end_search: end_search:
if (config_file_found == true) if (config_file_found == true)
{ {
if (verbose == true) log_verbose(LOG_NOTICE, _("configuration file found at: %s"), config_file_path);
{
log_notice(_("configuration file found at: %s"), config_file_path);
}
} }
else else
{ {
if (verbose == true) log_verbose(LOG_NOTICE, _("no configuration file provided or found"));
{
log_notice(_("no configuration file provided or found"));
}
} }
} }