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

MXS-1834 Compile all monitors as C++

Browse Source
This commit is contained in:
Johan Wikman
2018-04-27 10:35:31 +03:00
parent 490d8c0963
commit da16ba538d
9 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/monitor/auroramon/CMakeLists.txt
View File

@ -1,4 +1,4 @@
add_library(auroramon SHARED auroramon.c)
add_library(auroramon SHARED auroramon.cc)
target_link_libraries(auroramon maxscale-common)
add_dependencies(auroramon pcre2)
set_target_properties(auroramon PROPERTIES VERSION "1.0.0")

11
server/modules/monitor/auroramon/auroramon.c → server/modules/monitor/auroramon/auroramon.cc
View File

@ -48,7 +48,8 @@ void update_server_status(MXS_MONITOR *monitor, MXS_MONITORED_SERVER *database)
{
if (!SERVER_IN_MAINT(database->server))
{
SERVER temp_server = {.status = database->server->status};
SERVER temp_server = {};
temp_server.status = database->server->status;
server_clear_status_nolock(&temp_server, SERVER_RUNNING | SERVER_MASTER | SERVER_SLAVE | SERVER_AUTH_ERROR);
database->mon_prev_status = database->server->status;
@ -148,7 +149,7 @@ monitorMain(void *arg)
release_monitor_servers(monitor);
/** Sleep until the next monitoring interval */
int ms = 0;
unsigned int ms = 0;
while (ms < monitor->interval && !handle->shutdown)
{
if (monitor->server_pending_changes)
@ -188,7 +189,7 @@ static void auroramon_free(AURORA_MONITOR *handle)
static void *
startMonitor(MXS_MONITOR *mon, const MXS_CONFIG_PARAMETER *params)
{
AURORA_MONITOR *handle = mon->handle;
AURORA_MONITOR *handle = static_cast<AURORA_MONITOR*>(mon->handle);
if (handle)
{
@ -264,6 +265,8 @@ static json_t* diagnostics_json(const MXS_MONITOR *mon)
return NULL;
}
extern "C"
{
/**
* The module entry point routine. It is this routine that must populate the
* structure that is referred to as the "module object", this is a structure
@ -314,3 +317,5 @@ MXS_MODULE* MXS_CREATE_MODULE()
return &info;
}
}