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

MXS-1843: Test log throtting in a unique directory

Browse Source 
This rules out external influence as a reason for the test failure.
This commit is contained in:
Markus Mäkelä 2018-05-13 21:25:16 +03:00
parent e1e7ebe5d2
commit f29da6545b
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/core/test/test_logthrottling.cc
View File

@ -35,7 +35,8 @@ using std::string;
namespace
{
const char LOGNAME[] = "/tmp/maxscale.log";
const char LOGNAME[] = "maxscale.log";
static string logfile;
const size_t N_THREADS = 4;
sem_t u_semstart;
@ -110,7 +111,7 @@ bool run(const MXS_LOG_THROTTLING& throttling, int priority, size_t n_generate,
mxs_log_set_throttling(&throttling); // Causes message to be logged.
mxs_log_flush_sync();
ifstream in(LOGNAME);
ifstream in(logfile);
in.seekg(0, ios_base::end);
THREAD_ARG args[N_THREADS];
@ -167,9 +168,13 @@ int main(int argc, char* argv[])
rc = sem_init(&u_semfinish, 0, 0);
ensure(rc == 0);
unlink(LOGNAME);
if (mxs_log_init(NULL, "/tmp", MXS_LOG_TARGET_FS))
char tmpbuf[] = "/tmp/maxscale_test_logthrottling_XXXXXX";
char* logdir = mkdtemp(tmpbuf);
ensure(logdir);
logfile.assign(string{logdir} + '/' + LOGNAME);
if (mxs_log_init(NULL, logdir, MXS_LOG_TARGET_FS))
{
MXS_LOG_THROTTLING t;
@ -266,5 +271,10 @@ int main(int argc, char* argv[])
rc = EXIT_FAILURE;
}
// A crude method to remove all files but it works
string cmd = "rm -r ";
cmd += logdir;
system(cmd.c_str());
return rc;
}