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

MXS-2220 Move most remaining functions inside class

Browse Source 
Most of the ones still remaining outside are special cases.
Also, removed locking from status manipulation functions as it
has not been required for quite some time.
This commit is contained in:
Esa Korhonen
2019-01-07 16:02:05 +02:00
parent d5c78eb31f
commit 1c647f3753
13 changed files with 145 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/core/test/test_server.cc
View File

@ -59,7 +59,6 @@ static int test1()
{
int result;
std::string status;
using mxs::server_status;
/* Server tests */
fprintf(stderr, "testserver : creating server called MyServer");
@ -77,20 +76,20 @@ static int test1()
"Should not find non-existent unique name.");
mxb_assert_message(server == Server::find_by_unique_name("uniquename"), "Should find by unique name.");
fprintf(stderr, "\t..done\nTesting Status Setting for Server.");
status = server_status(server);
status = server->status_string();
mxb_assert_message(status == "Running", "Status of Server should be Running by default.");
server_set_status_nolock(server, SERVER_MASTER);
status = server_status(server);
server->set_status(SERVER_MASTER);
status = server->status_string();
mxb_assert_message(status == "Master, Running", "Should find correct status.");
server_clear_status_nolock(server, SERVER_MASTER);
status = server_status(server);
server->clear_status(SERVER_MASTER);
status = server->status_string();
mxb_assert_message(status == "Running",
"Status of Server should be Running after master status cleared.");
fprintf(stderr, "\t..done\nRun Prints for Server and all Servers.");
server->printServer();
Server::printAllServers();
fprintf(stderr, "\t..done\nFreeing Server.");
server_free((Server*)server);
Server::server_free(server);
fprintf(stderr, "\t..done\n");
return 0;
}