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

Load config before qc is initialized.

Browse Source 
That way a query_classifier entry in maxscale.cnf will be available
before the initialization takes place.
This commit is contained in:
Johan Wikman
2016-02-01 20:38:51 +02:00
parent bbfcbc18c6
commit e668abec5b
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server/core/gateway.c
View File

@ -1769,6 +1769,19 @@ int main(int argc, char **argv)
MXS_NOTICE("Module directory: %s", get_libdir()); MXS_NOTICE("Module directory: %s", get_libdir());
MXS_NOTICE("Service cache: %s", get_cachedir()); MXS_NOTICE("Service cache: %s", get_cachedir());
if (!config_load(cnf_file_path))
{
char* fprerr =
"Failed to open, read or process the MaxScale configuration "
"file. Exiting. See the error log for details.";
print_log_n_stderr(false, !daemon_mode, fprerr, fprerr, 0);
MXS_ERROR("Failed to open, read or process the MaxScale configuration file %s. "
"Exiting.",
cnf_file_path);
rc = MAXSCALE_BADCONFIG;
goto return_main;
}
if (!qc_init(NULL)) if (!qc_init(NULL))
{ {
char* logerr = "Failed to initialise query classifier library."; char* logerr = "Failed to initialise query classifier library.";
@ -1824,18 +1837,6 @@ int main(int argc, char **argv)
} }
libmysql_initialized = TRUE; libmysql_initialized = TRUE;
if (!config_load(cnf_file_path))
{
char* fprerr =
"Failed to open, read or process the MaxScale configuration "
"file. Exiting. See the error log for details.";
print_log_n_stderr(false, !daemon_mode, fprerr, fprerr, 0);
MXS_ERROR("Failed to open, read or process the MaxScale configuration file %s. "
"Exiting.",
cnf_file_path);
rc = MAXSCALE_BADCONFIG;
goto return_main;
}
MXS_NOTICE("MariaDB Corporation MaxScale %s (C) MariaDB Corporation Ab 2013-2015", MAXSCALE_VERSION); MXS_NOTICE("MariaDB Corporation MaxScale %s (C) MariaDB Corporation Ab 2013-2015", MAXSCALE_VERSION);
MXS_NOTICE("MaxScale is running in process %i", getpid()); MXS_NOTICE("MaxScale is running in process %i", getpid());