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

MXS-2271 Clean up server list parsing functions, use in monitor config

Browse Source 
The functions now return the parsed array.
This commit is contained in:
Esa Korhonen
2019-01-30 12:22:34 +02:00
parent 6038f1f386
commit 7cb969b0d9
8 changed files with 143 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
server/core/server.cc
View File

@ -370,32 +370,15 @@ Server* Server::find_by_unique_name(const string& name)
return rval;
}
int SERVER::server_find_by_unique_names(char** server_names, int size, SERVER*** output)
std::vector<SERVER*> SERVER::server_find_by_unique_names(const std::vector<string>& server_names)
{
mxb_assert(server_names && (size > 0));
SERVER** results = (SERVER**)MXS_CALLOC(size, sizeof(SERVER*));
if (!results)
std::vector<SERVER*> rval;
rval.reserve(server_names.size());
for (auto elem : server_names)
{
return 0;
rval.push_back(Server::find_by_unique_name(elem));
}
int found = 0;
for (int i = 0; i < size; i++)
{
results[i] = Server::find_by_unique_name(server_names[i]);
found += (results[i]) ? 1 : 0;
}
if (found)
{
*output = results;
}
else
{
MXS_FREE(results);
}
return found;
return rval;
}
void Server::printServer()