hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1464 When pre-parsing, only check maxscale section

Browse Source 
When pre-parsing the configuration file, the existence of environment
variables is only done for the [maxscale] section. For other sections
a nicer error message is obtained if the comlplaint is made when the
configuration file is actually loaded.

Mechanism for providing custom error message from the pre-parsing
function added.
This commit is contained in:
Johan Wikman
2017-10-09 15:52:24 +03:00
parent 22f4b02b44
commit d1df1837a4
2 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/config.cc
View File

@ -472,7 +472,7 @@ static int ini_handler(void *userdata, const char *section, const char *name, co
if (!env_value) if (!env_value)
{ {
MXS_ERROR("The environment variable %s, used as value for parameter %s " MXS_ERROR("The environment variable %s, used as value for parameter %s "
"in section %s, does not exist.", value, name, section); "in section %s, does not exist.", value + 1, name, section);
return 0; return 0;
} }

48
server/core/gateway.cc
View File

@ -2608,7 +2608,8 @@ void set_log_augmentation(const char* value)
/** /**
* Pre-parse the configuration file for various directory paths. * Pre-parse the configuration file for various directory paths.
* @param data Parameter passed by inih * @param data Pointer to variable where custom dynamically allocated
* error message can be stored.
* @param section Section name * @param section Section name
* @param name Parameter name * @param name Parameter name
* @param value Parameter value * @param value Parameter value
@ -2618,6 +2619,11 @@ static int cnf_preparser(void* data, const char* section, const char* name, cons
{ {
MXS_CONFIG* cnf = config_get_global_options(); MXS_CONFIG* cnf = config_get_global_options();
char *tmp;
/** These are read from the configuration file. These will not override
* command line parameters but will override default values. */
if (strcasecmp(section, "maxscale") == 0)
{
if (cnf->substitute_variables) if (cnf->substitute_variables)
{ {
if (*value == '$') if (*value == '$')
@ -2626,8 +2632,16 @@ static int cnf_preparser(void* data, const char* section, const char* name, cons
if (!env_value) if (!env_value)
{ {
MXS_ERROR("The environment variable %s, used as value for parameter %s " char** s = (char**)data;
"in section %s, does not exist.", value, name, section);
static const char FORMAT[] = "The environment variable %s does not exist.";
*s = (char*)MXS_MALLOC(sizeof(FORMAT) + strlen(value));
if (*s)
{
sprintf(*s, FORMAT, value + 1);
}
return 0; return 0;
} }
@ -2635,11 +2649,6 @@ static int cnf_preparser(void* data, const char* section, const char* name, cons
} }
} }
char *tmp;
/** These are read from the configuration file. These will not override
* command line parameters but will override default values. */
if (strcasecmp(section, "maxscale") == 0)
{
if (strcmp(name, "logdir") == 0) if (strcmp(name, "logdir") == 0)
{ {
if (strcmp(get_logdir(), default_logdir) == 0) if (strcmp(get_logdir(), default_logdir) == 0)
@ -2981,24 +2990,37 @@ static bool daemonize(void)
*/ */
static bool sniff_configuration(const char* filepath) static bool sniff_configuration(const char* filepath)
{ {
int rv = ini_parse(filepath, cnf_preparser, NULL); char* s = NULL;
int rv = ini_parse(filepath, cnf_preparser, &s);
if (rv != 0) if (rv != 0)
{ {
const char FORMAT_CUSTOM[] =
"Failed to pre-parse configuration file %s. Error on line %d. %s";
const char FORMAT_SYNTAX[] = const char FORMAT_SYNTAX[] =
"Error: Failed to pre-parse configuration file %s. Error on line %d."; "Failed to pre-parse configuration file %s. Error on line %d.";
const char FORMAT_OPEN[] = const char FORMAT_OPEN[] =
"Error: Failed to pre-parse configuration file %s. Failed to open file."; "Failed to pre-parse configuration file %s. Failed to open file.";
const char FORMAT_MALLOC[] = const char FORMAT_MALLOC[] =
"Error: Failed to pre-parse configuration file %s. Memory allocation failed."; "Failed to pre-parse configuration file %s. Memory allocation failed.";
size_t extra = strlen(filepath) + UINTLEN(abs(rv)) + (s ? strlen(s) : 0);
// We just use the largest one. // We just use the largest one.
char errorbuffer[sizeof(FORMAT_MALLOC) + strlen(filepath) + UINTLEN(abs(rv))]; char errorbuffer[sizeof(FORMAT_MALLOC) + extra];
if (rv > 0) if (rv > 0)
{
if (s)
{
snprintf(errorbuffer, sizeof(errorbuffer), FORMAT_CUSTOM, filepath, rv, s);
MXS_FREE(s);
}
else
{ {
snprintf(errorbuffer, sizeof(errorbuffer), FORMAT_SYNTAX, filepath, rv); snprintf(errorbuffer, sizeof(errorbuffer), FORMAT_SYNTAX, filepath, rv);
} }
}
else if (rv == -1) else if (rv == -1)
{ {
snprintf(errorbuffer, sizeof(errorbuffer), FORMAT_OPEN, filepath); snprintf(errorbuffer, sizeof(errorbuffer), FORMAT_OPEN, filepath);