From e979a73cc0e3ac1f8965c121b48fa10cbc1eb8d2 Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Wed, 5 Dec 2018 12:58:43 +0200 Subject: [PATCH] Remove the STRSRVSTATUS macro Use server_status() instead. --- include/maxscale/server.hh | 27 ------------------- server/core/monitor.cc | 2 +- .../MySQL/mariadbbackend/mysql_backend.cc | 2 +- .../readwritesplit/rwsplit_select_backends.cc | 10 +++---- .../schemarouter/schemarouterinstance.cc | 4 +-- 5 files changed, 9 insertions(+), 36 deletions(-) diff --git a/include/maxscale/server.hh b/include/maxscale/server.hh index f30290902..b23d1716a 100644 --- a/include/maxscale/server.hh +++ b/include/maxscale/server.hh @@ -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? * diff --git a/server/core/monitor.cc b/server/core/monitor.cc index 6ef7a1750..c32a17c92 100644 --- a/server/core/monitor.cc +++ b/server/core/monitor.cc @@ -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 diff --git a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc index 9c3dda097..c2b6eef8c 100644 --- a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc +++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc @@ -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); diff --git a/server/modules/routing/readwritesplit/rwsplit_select_backends.cc b/server/modules/routing/readwritesplit/rwsplit_select_backends.cc index 25090a0ee..55d4015aa 100644 --- a/server/modules/routing/readwritesplit/rwsplit_select_backends.cc +++ b/server/modules/routing/readwritesplit/rwsplit_select_backends.cc @@ -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; diff --git a/server/modules/routing/schemarouter/schemarouterinstance.cc b/server/modules/routing/schemarouter/schemarouterinstance.cc index 384a75087..f93375b97 100644 --- a/server/modules/routing/schemarouter/schemarouterinstance.cc +++ b/server/modules/routing/schemarouter/schemarouterinstance.cc @@ -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); }