MXS-2005: Use log manager only after initialization

The log manager functions must not be used before it is initialized.
This commit is contained in:
Markus Mäkelä
2018-08-12 11:01:53 +03:00
parent 39ce6c624f
commit 5a306aa20a
13 changed files with 22 additions and 6 deletions

View File

@ -37,6 +37,9 @@ int main(int argc, char** argv)
return 1;
}
mxs_log_init(NULL, NULL, MXS_LOG_TARGET_STDOUT);
atexit(mxs_log_finish);
if (!utils_init())
{
cout << "Utils library init failed." << endl;

View File

@ -379,6 +379,7 @@ int main(int argc, char **argv)
result += test_add_parameter();
result += test_required_parameters();
result += test_disk_space_threshold();
mxs_log_finish();
}
else
{

View File

@ -574,10 +574,10 @@ int main()
srandom(time(NULL));
mxs_log_set_syslog_enabled(true);
if (mxs_log_init("TEST_EVENT", ".", MXS_LOG_TARGET_DEFAULT))
{
mxs_log_set_syslog_enabled(true);
errors += test_levels();
errors += test_facilities();
errors += test_events();

View File

@ -147,10 +147,13 @@ main(int argc, char **argv)
{
int result = 0;
set_libdir(MXS_STRDUP_A("../../modules/filter/qlafilter/"));
mxs_log_init(NULL, NULL, MXS_LOG_TARGET_STDOUT);
result += test1();
result += test2();
result += test3();
mxs_log_finish();
exit(result);
}

View File

@ -465,6 +465,7 @@ int main(int argc, char **argv)
{
int rc = 0;
mxs_log_init(NULL, NULL, MXS_LOG_TARGET_STDOUT);
mxs::MessageQueue::init();
rc += test_arguments();
@ -476,5 +477,6 @@ int main(int argc, char **argv)
rc += test_domain_matching("mariadbmon", "mysqlmon", "test_domain_matching2");
rc += test_output();
mxs_log_finish();
return rc;
}

View File

@ -182,6 +182,7 @@ int main(int argc, char **argv)
* allocation from failing if multiple modules from different directories are
* loaded in one core function call.
*/
mxs_log_init(NULL, NULL, MXS_LOG_TARGET_STDOUT);
set_libdir(MXS_STRDUP_A("../../modules/authenticator/NullAuthAllow/"));
load_module("NullAuthAllow", MODULE_AUTHENTICATOR);
set_libdir(MXS_STRDUP_A("../../modules/protocol/HTTPD/"));
@ -196,5 +197,6 @@ int main(int argc, char **argv)
result++;
}
mxs_log_finish();
exit(result);
}

View File

@ -53,7 +53,6 @@ test1()
int result;
int argc = 3;
mxs_log_init(NULL, "/tmp", MXS_LOG_TARGET_FS);
init_test_env(NULL);
set_libdir(MXS_STRDUP_A("../../modules/authenticator/MySQLAuth/"));

View File

@ -40,6 +40,7 @@ void init_test_env(char *path)
{
exit(1);
}
atexit(mxs_log_finish);
dcb_global_init();
set_libdir(MXS_STRDUP(TEST_DIR "/query_classifier/qc_sqlite/"));
qc_setup(NULL, QC_SQL_MODE_DEFAULT, NULL, NULL);