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

MXS-2271 Rename MXS_MONITORED_SERVER to MonitorServer

Browse Source
This commit is contained in:
Esa Korhonen
2019-03-13 11:24:05 +02:00
parent 6042a53cb3
commit 6b14479b6c
22 changed files with 145 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/monitor/grmon/grmon.cc
View File

@ -25,7 +25,7 @@
#include <maxscale/protocol/mysql.hh>
#include <mysqld_error.h>
using maxscale::MXS_MONITORED_SERVER;
using maxscale::MonitorServer;
GRMon::GRMon(const std::string& name, const std::string& module)
: MonitorWorkerSimple(name, module)
@ -54,7 +54,7 @@ static inline bool is_false(const char* value)
|| strcasecmp(value, "false") == 0;
}
static bool is_master(MXS_MONITORED_SERVER* server)
static bool is_master(MonitorServer* server)
{
bool rval = false;
MYSQL_RES* result;
@ -81,7 +81,7 @@ static bool is_master(MXS_MONITORED_SERVER* server)
return rval;
}
static bool is_slave(MXS_MONITORED_SERVER* server)
static bool is_slave(MonitorServer* server)
{
bool rval = false;
MYSQL_RES* result;
@ -108,7 +108,7 @@ static bool is_slave(MXS_MONITORED_SERVER* server)
return rval;
}
void GRMon::update_server_status(MXS_MONITORED_SERVER* monitored_server)
void GRMon::update_server_status(MonitorServer* monitored_server)
{
if (is_master(monitored_server))
{

2
server/modules/monitor/grmon/grmon.hh
View File

@ -30,7 +30,7 @@ public:
protected:
bool has_sufficient_permissions();
void update_server_status(mxs::MXS_MONITORED_SERVER* monitored_server);
void update_server_status(mxs::MonitorServer* monitored_server);
private:
GRMon(const std::string& name, const std::string& module);