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

Remove the STRSRVSTATUS macro

Browse Source 
Use server_status() instead.
This commit is contained in:
Esa Korhonen 2018-12-05 12:58:43 +02:00
parent 86574c16fb
commit e979a73cc0
5 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/maxscale/server.hh
View File

@ -175,33 +175,6 @@ struct SERVER
// Bits providing general information
#define SERVER_DISK_SPACE_EXHAUSTED (1 << 31) /**<< The disk space of the server is exhausted */
#define STRSRVSTATUS(s) \
(server_is_master(s) ? "RUNNING MASTER" \
: (server_is_slave(s) ? "RUNNING SLAVE" \
: (server_is_joined(s) ? "RUNNING JOINED" \
: (server_is_ndb(s) \
? "RUNNING NDB" \
: (( \
server_is_running(s) \
&& \
server_is_in_maint(s)) \
? \
"RUNNING MAINTENANCE" \
: ( \
server_is_relay(s) \
? \
"RUNNING RELAY" \
: ( \
server_is_usable(s) \
? \
"RUNNING (only)" \
: ( \
server_is_down(s) \
? \
"DOWN" \
: \
"UNKNOWN STATUS"))))))))
/**
* Is the server valid and active?
*

2
server/core/monitor.cc
View File

@ -2863,7 +2863,7 @@ void MonitorInstanceSimple::tick()
MXS_DEBUG("Backend server [%s]:%d state : %s",
pMs->server->address,
pMs->server->port,
STRSRVSTATUS(&server));
mxs::server_status(&server).c_str());
}
#endif

2
server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc
View File

@ -1219,7 +1219,7 @@ static int gw_MySQLWrite_backend(DCB* dcb, GWBUF* queue)
dcb->server->name,
backend_protocol->protocol_auth_state == MXS_AUTH_STATE_HANDSHAKE_FAILED ?
"handshake" : "authentication",
STRSRVSTATUS(dcb->server));
mxs::server_status(dcb->server).c_str());
}
gwbuf_free(queue);

10
server/modules/routing/readwritesplit/rwsplit_select_backends.cc
View File

@ -273,7 +273,7 @@ static void log_server_connections(select_criteria_t criteria, const PRWBackends
b->server->stats.n_current,
b->server->address,
b->server->port,
STRSRVSTATUS(b->server));
mxs::server_status(b->server).c_str());
break;
case LEAST_ROUTER_CONNECTIONS:
@ -281,7 +281,7 @@ static void log_server_connections(select_criteria_t criteria, const PRWBackends
b->connections,
b->server->address,
b->server->port,
STRSRVSTATUS(b->server));
mxs::server_status(b->server).c_str());
break;
case LEAST_CURRENT_OPERATIONS:
@ -289,7 +289,7 @@ static void log_server_connections(select_criteria_t criteria, const PRWBackends
b->server->stats.n_current_ops,
b->server->address,
b->server->port,
STRSRVSTATUS(b->server));
mxs::server_status(b->server).c_str());
break;
case LEAST_BEHIND_MASTER:
@ -297,7 +297,7 @@ static void log_server_connections(select_criteria_t criteria, const PRWBackends
b->server->rlag,
b->server->address,
b->server->port,
STRSRVSTATUS(b->server));
mxs::server_status(b->server).c_str());
break;
case ADAPTIVE_ROUTING:
@ -309,7 +309,7 @@ static void log_server_connections(select_criteria_t criteria, const PRWBackends
os.str().c_str(),
b->server->address,
b->server->port,
STRSRVSTATUS(b->server));
mxs::server_status(b->server).c_str());
}
break;

4
server/modules/routing/schemarouter/schemarouterinstance.cc
View File

@ -116,7 +116,7 @@ bool connect_backend_servers(SSRBackendList& backends, MXS_SESSION* session)
b->server->stats.n_current,
b->server->address,
b->server->port,
STRSRVSTATUS(b->server));
mxs::server_status(b->server).c_str());
}
}
/**
@ -170,7 +170,7 @@ bool connect_backend_servers(SSRBackendList& backends, MXS_SESSION* session)
if ((*it)->in_use())
{
MXS_INFO("Connected %s in \t%s:%d",
STRSRVSTATUS(b->server),
mxs::server_status(b->server).c_str(),
b->server->address,
b->server->port);
}