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/csmon/csmon.cc
View File

@ -22,7 +22,7 @@
#include <maxscale/modinfo.h>
#include <maxscale/mysql_utils.hh>
using maxscale::MXS_MONITORED_SERVER;
using maxscale::MonitorServer;
namespace
{
@ -31,7 +31,7 @@ constexpr const char* alive_query = "SELECT mcsSystemReady() = 1 && mcsSystemRea
constexpr const char* role_query = "SELECT mcsSystemPrimary()";
// Helper for extracting string results from queries
static std::string do_query(MXS_MONITORED_SERVER* srv, const char* query)
static std::string do_query(MonitorServer* srv, const char* query)
{
std::string rval;
MYSQL_RES* result;
@ -56,7 +56,7 @@ static std::string do_query(MXS_MONITORED_SERVER* srv, const char* query)
}
// Returns a numeric version similar to mysql_get_server_version
int get_cs_version(MXS_MONITORED_SERVER* srv)
int get_cs_version(MonitorServer* srv)
{
// GCC 4.8 appears to have a broken std::regex_constants::ECMAScript that doesn't support brackets
std::regex re("Columnstore \\([0-9]*\\)[.]\\([0-9]*\\)[.]\\([0-9]*\\)-[0-9]*",
@ -95,7 +95,7 @@ bool CsMonitor::has_sufficient_permissions()
return test_permissions(alive_query);
}
void CsMonitor::update_server_status(MXS_MONITORED_SERVER* srv)
void CsMonitor::update_server_status(MonitorServer* srv)
{
srv->clear_pending_status(SERVER_MASTER | SERVER_SLAVE | SERVER_RUNNING);
int status = 0;

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

@ -26,7 +26,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:
CsMonitor(const std::string& name, const std::string& module);