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

Rename MXS_MONITOR_SERVERS to MXS_MONITORED_SERVER

Browse Source 
An element in a linked list is not a list.
This commit is contained in:
Johan Wikman
2017-10-02 15:01:56 +03:00
parent 27ccf0877c
commit 8d03876e3e
11 changed files with 144 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/modules/monitor/mmmon/mmmon.c
View File

@ -43,7 +43,7 @@ static void stopMonitor(MXS_MONITOR *);
static void diagnostics(DCB *, const MXS_MONITOR *);
static json_t* diagnostics_json(const MXS_MONITOR *);
static void detectStaleMaster(void *, int);
static MXS_MONITOR_SERVERS *get_current_master(MXS_MONITOR *);
static MXS_MONITORED_SERVER *get_current_master(MXS_MONITOR *);
static bool isMySQLEvent(mxs_monitor_event_t event);
/**
@ -203,7 +203,7 @@ static json_t* diagnostics_json(const MXS_MONITOR *mon)
* @param database The database to probe
*/
static void
monitorDatabase(MXS_MONITOR* mon, MXS_MONITOR_SERVERS *database)
monitorDatabase(MXS_MONITOR* mon, MXS_MONITORED_SERVER *database)
{
MYSQL_ROW row;
MYSQL_RES *result;
@ -500,9 +500,9 @@ monitorMain(void *arg)
{
MM_MONITOR *handle = (MM_MONITOR *)arg;
MXS_MONITOR* mon = handle->monitor;
MXS_MONITOR_SERVERS *ptr;
MXS_MONITORED_SERVER *ptr;
int detect_stale_master = false;
MXS_MONITOR_SERVERS *root_master = NULL;
MXS_MONITORED_SERVER *root_master = NULL;
size_t nrounds = 0;
detect_stale_master = handle->detectStaleMaster;
@ -651,10 +651,10 @@ detectStaleMaster(void *arg, int enable)
* @return The server at root level with SERVER_MASTER bit
*/
static MXS_MONITOR_SERVERS *get_current_master(MXS_MONITOR *mon)
static MXS_MONITORED_SERVER *get_current_master(MXS_MONITOR *mon)
{
MM_MONITOR* handle = mon->handle;
MXS_MONITOR_SERVERS *ptr;
MXS_MONITORED_SERVER *ptr;
ptr = mon->databases;