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

Handle "include_if_exists"

Browse Source
This commit is contained in:
Ian Barwick
2020-04-30 10:49:23 +09:00
parent 682ec9184a
commit 0df0db1281
1 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
configfile-scan.l
View File

@@ -38,11 +38,11 @@ static sigjmp_buf *CONF_flex_fatal_jmp;
static char *CONF_scanstr(const char *s); static char *CONF_scanstr(const char *s);
static int CONF_flex_fatal(const char *msg); static int CONF_flex_fatal(const char *msg);
static bool ProcessConfigFile(const char *base_dir, const char *config_file, const char *calling_file, KeyValueList *contents, t_configuration_options *options, ItemList *error_list, ItemList *warning_list); static bool ProcessConfigFile(const char *base_dir, const char *config_file, const char *calling_file, bool strict, KeyValueList *contents, t_configuration_options *options, ItemList *error_list, ItemList *warning_list);
static bool ProcessConfigFp(FILE *fp, const char *config_file, const char *calling_file, const char *base_dir, KeyValueList *contents, t_configuration_options *options, ItemList *error_list, ItemList *warning_list); static bool ProcessConfigFp(FILE *fp, const char *config_file, const char *calling_file, const char *base_dir, KeyValueList *contents, t_configuration_options *options, ItemList *error_list, ItemList *warning_list);
static char *AbsoluteConfigLocation(const char *base_dir, const char *location, const char *calling_file); static char *AbsoluteConfigLocation(const char *base_dir, const char *location, const char *calling_file);
%} %}
@@ -97,7 +97,7 @@ STRING \'([^'\\\n]|\\.|\'\')*\'
extern bool extern bool
ProcessRepmgrConfigFile(const char *config_file, const char *base_dir, t_configuration_options *options, ItemList *error_list, ItemList *warning_list) ProcessRepmgrConfigFile(const char *config_file, const char *base_dir, t_configuration_options *options, ItemList *error_list, ItemList *warning_list)
{ {
return ProcessConfigFile(base_dir, config_file, NULL, NULL, options, error_list, warning_list); return ProcessConfigFile(base_dir, config_file, NULL, true, NULL, options, error_list, warning_list);
} }
extern bool extern bool
@@ -105,11 +105,11 @@ ProcessPostgresConfigFile(const char *config_file, const char *base_dir, KeyValu
{ {
printf("ProcessPostgresConfigFile(): base: %s file: %s\n", base_dir, config_file); printf("ProcessPostgresConfigFile(): base: %s file: %s\n", base_dir, config_file);
return ProcessConfigFile(base_dir, config_file, NULL, contents, NULL, error_list, warning_list); return ProcessConfigFile(base_dir, config_file, NULL, true, contents, NULL, error_list, warning_list);
} }
static bool static bool
ProcessConfigFile(const char *base_dir, const char *config_file, const char *calling_file, KeyValueList *contents, t_configuration_options *options, ItemList *error_list, ItemList *warning_list) ProcessConfigFile(const char *base_dir, const char *config_file, const char *calling_file, bool strict, KeyValueList *contents, t_configuration_options *options, ItemList *error_list, ItemList *warning_list)
{ {
char *abs_path; char *abs_path;
bool success = true; bool success = true;
@@ -131,11 +131,20 @@ ProcessConfigFile(const char *base_dir, const char *config_file, const char *cal
fp = fopen(abs_path, "r"); fp = fopen(abs_path, "r");
if (!fp) if (!fp)
{ {
item_list_append_format(error_list, if (strict == false)
"could not open configuration file \"%s\": %s", {
abs_path, item_list_append_format(error_list,
strerror(errno)); "skipping configuration file \"%s\"",
success = false; abs_path);
}
else
{
item_list_append_format(error_list,
"could not open configuration file \"%s\": %s",
abs_path,
strerror(errno));
success = false;
}
} }
else else
{ {
@@ -231,12 +240,19 @@ ProcessConfigFp(FILE *fp, const char *config_file, const char *calling_file, con
} }
else if (base_dir != NULL && strcasecmp(opt_name, "include_if_exists") == 0) else if (base_dir != NULL && strcasecmp(opt_name, "include_if_exists") == 0)
{ {
if (!ProcessConfigFile(base_dir, opt_value, config_file,
false, contents, options,
error_list, warning_list))
OK = false;
yy_switch_to_buffer(lex_buffer);
pfree(opt_name);
pfree(opt_value);
} }
else if (base_dir != NULL && strcasecmp(opt_name, "include") == 0) else if (base_dir != NULL && strcasecmp(opt_name, "include") == 0)
{ {
printf("ProcessConfigFp(): include %s %s base: %s\n", opt_value, config_file, base_dir);
if (!ProcessConfigFile(base_dir, opt_value, config_file, if (!ProcessConfigFile(base_dir, opt_value, config_file,
contents, options, true, contents, options,
error_list, warning_list)) error_list, warning_list))
OK = false; OK = false;