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

MXS-2220 Store server parameters in stl containers

Browse Source 
The custom parameters are now protected from concurrent access.
This commit is contained in:
Esa Korhonen
2018-12-13 16:45:54 +02:00
parent 383f5304d9
commit 569c66fa28
8 changed files with 203 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/config_runtime.cc
View File

@ -244,7 +244,7 @@ bool runtime_create_server(const char* name,
Server* server = Server::server_alloc(name, ctx.parameters);
if (server && server_serialize(server))
if (server && server->serialize())
{
rval = true;
MXS_NOTICE("Created server '%s' at %s:%u",
@ -383,7 +383,7 @@ bool runtime_enable_server_ssl(Server* server,
atomic_synchronize();
server->server_ssl = ssl;
if (server_serialize(server))
if (server->serialize())
{
MXS_NOTICE("Enabled SSL for server '%s'", server->name);
rval = true;
@ -476,7 +476,7 @@ bool runtime_alter_server(Server* server, const char* key, const char* value)
}
std::lock_guard<std::mutex> guard(crt_lock);
server_set_parameter(server, key, value);
server->set_parameter(key, value);
if (strcmp(key, CN_ADDRESS) == 0)
{
@ -524,7 +524,7 @@ bool runtime_alter_server(Server* server, const char* key, const char* value)
service_update_weights();
}
server_serialize(server);
server->serialize();
MXS_NOTICE("Updated server '%s': %s=%s", server->name, key, value);
return true;