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

MXS-2220 Miscellaneous cleanup

Browse Source 
Removes some duplicate includes.
This commit is contained in:
Esa Korhonen
2019-01-08 16:23:21 +02:00
parent 9823fe2651
commit 87913f8cb8
5 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/core/server.cc
View File

@ -25,11 +25,10 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <string>
#include <list>
#include <mutex>
#include <sstream>
#include <mutex>
#include <string>
#include <maxbase/atomic.hh>
#include <maxbase/stopwatch.hh>
@ -47,7 +46,6 @@
#include <maxscale/clock.h>
#include <maxscale/http.hh>
#include <maxscale/maxscale.h>
#include <maxscale/server.hh>
#include <maxscale/routingworker.hh>
#include "internal/monitor.hh"
@ -770,7 +768,7 @@ string Server::get_custom_parameter(const string& name) const
*
* @return A Result set
*/
std::unique_ptr<ResultSet> serverGetList()
std::unique_ptr<ResultSet> Server::getList()
{
std::unique_ptr<ResultSet> set =
ResultSet::create({"Server", "Address", "Port", "Connections", "Status"});
@ -1139,11 +1137,11 @@ static json_t* server_to_json_data(const Server* server, const char* host)
return rval;
}
json_t* server_to_json(const Server* server, const char* host)
json_t* Server::to_json(const char* host)
{
string self = MXS_JSON_API_SERVERS;
self += server->name();
return mxs_json_resource(host, self.c_str(), server_to_json_data(server, host));
self += name();
return mxs_json_resource(host, self.c_str(), server_to_json_data(this, host));
}
json_t* Server::server_list_to_json(const char* host)