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

MXS-2057 Add log output for system test, and two random code fixes

Browse Source
This commit is contained in:
Niclas Antti
2018-11-13 17:20:39 +02:00
parent a84748e67f
commit e371964f8b
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
maxscale-system-test/testconnections.cpp
View File

@ -1255,6 +1255,7 @@ static int read_log(const char* name, char** err_log_content_p)
err_log_content[size] = '\0'; err_log_content[size] = '\0';
// printf("s=%ld\n", strlen(err_log_content)); // printf("s=%ld\n", strlen(err_log_content));
* err_log_content_p = err_log_content; * err_log_content_p = err_log_content;
fclose(f);
return 0; return 0;
} }
else else

2
maxutils/maxbase/include/maxbase/stopwatch.hh
View File

@ -49,7 +49,7 @@ struct Duration : public Clock::duration
} }
/** To seconds */ /** To seconds */
double secs() double secs() const
{ {
return std::chrono::duration<double>(*this).count(); return std::chrono::duration<double>(*this).count();
} }

1
server/core/routingworker.cc
View File

@ -1020,6 +1020,7 @@ void RoutingWorker::check_systemd_watchdog()
{ {
s_watchdog_next_check = now + s_watchdog_interval; s_watchdog_next_check = now + s_watchdog_interval;
#ifdef HAVE_SYSTEMD #ifdef HAVE_SYSTEMD
MXS_DEBUG("systemd watchdog keep-alive ping: sd_notify(false, \"WATCHDOG=1\")");
sd_notify(false, "WATCHDOG=1"); sd_notify(false, "WATCHDOG=1");
#endif #endif
std::for_each(this_unit.ppWorkers, this_unit.ppWorkers + this_unit.nWorkers, std::for_each(this_unit.ppWorkers, this_unit.ppWorkers + this_unit.nWorkers,