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

4
server/modules/monitor/clustrixmon/clustrix.cc
View File

@ -15,7 +15,7 @@
#include <maxbase/assert.h>
using maxscale::Monitor;
using maxscale::MXS_MONITORED_SERVER;
using maxscale::MonitorServer;
namespace
{
@ -206,7 +206,7 @@ bool Clustrix::is_being_softfailed(const char* zName, const SERVER& server, MYSQ
}
bool Clustrix::ping_or_connect_to_hub(const char* zName,
const MXS_MONITORED_SERVER::ConnectionSettings& settings,
const MonitorServer::ConnectionSettings& settings,
Softfailed softfailed,
SERVER& server,
MYSQL** ppCon)

8
server/modules/monitor/clustrixmon/clustrix.hh
View File

@ -65,7 +65,7 @@ bool is_part_of_the_quorum(const char* zName, const SERVER& server, MYSQL* pCon)
*
* @return True, if the node is part of the quorum, false otherwise.
*/
inline bool is_part_of_the_quorum(const char* zName, mxs::MXS_MONITORED_SERVER& ms)
inline bool is_part_of_the_quorum(const char* zName, mxs::MonitorServer& ms)
{
mxb_assert(ms.server);
mxb_assert(ms.con);
@ -100,7 +100,7 @@ bool is_being_softfailed(const char* zName, const SERVER& server, MYSQL* pCon);
* @note Upon return @c *ppCon will be non-NULL.
*/
bool ping_or_connect_to_hub(const char* zName,
const mxs::MXS_MONITORED_SERVER::ConnectionSettings& settings,
const mxs::MonitorServer::ConnectionSettings& settings,
Softfailed softfailed,
SERVER& server,
MYSQL** ppCon);
@ -117,9 +117,9 @@ bool ping_or_connect_to_hub(const char* zName,
* @return True, if the server can be used as hub, false otherwise.
*/
inline bool ping_or_connect_to_hub(const char* zName,
const mxs::MXS_MONITORED_SERVER::ConnectionSettings& settings,
const mxs::MonitorServer::ConnectionSettings& settings,
Softfailed softfailed,
mxs::MXS_MONITORED_SERVER& ms)
mxs::MonitorServer& ms)
{
return ping_or_connect_to_hub(zName, settings, softfailed, *ms.server, &ms.con);
}

4
server/modules/monitor/clustrixmon/clustrixmonitor.cc
View File

@ -20,7 +20,7 @@
namespace http = mxb::http;
using namespace std;
using maxscale::MXS_MONITORED_SERVER;
using maxscale::MonitorServer;
#define LOG_JSON_ERROR(ppJson, format, ...) \
do { \
@ -215,7 +215,7 @@ void ClustrixMonitor::choose_hub(Clustrix::Softfailed softfailed)
for (auto it = m_servers.begin(); !pHub_con && (it != m_servers.end()); ++it)
{
MXS_MONITORED_SERVER& ms = **it;
MonitorServer& ms = **it;
if (ips.find(ms.server->address) == ips.end())
{

2
server/modules/monitor/clustrixmon/clustrixnode.cc
View File

@ -15,7 +15,7 @@
#include "clustrix.hh"
bool ClustrixNode::can_be_used_as_hub(const char* zName,
const mxs::MXS_MONITORED_SERVER::ConnectionSettings& settings)
const mxs::MonitorServer::ConnectionSettings& settings)
{
mxb_assert(m_pServer);
bool rv = Clustrix::ping_or_connect_to_hub(zName, settings, Clustrix::Softfailed::REJECT,

2
server/modules/monitor/clustrixmon/clustrixnode.hh
View File

@ -161,7 +161,7 @@ public:
}
bool can_be_used_as_hub(const char* zName,
const mxs::MXS_MONITORED_SERVER::ConnectionSettings& settings);
const mxs::MonitorServer::ConnectionSettings& settings);
SERVER* server() const
{