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
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?
*