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

Make server creation simpler

Browse Source 
Server creation and allocation are now the same apart from the fact that
allocation only adds the server to the running configuration where as the
creation of a server also persist it to disk.

The server serialization should not be seen through the server.h API. This
allows the serialization method to change without actually having to
change the interfaces.
This commit is contained in:
Markus Makela
2016-11-11 10:13:14 +02:00
parent 16e8aa7178
commit 08ebb88aec
7 changed files with 174 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/modules/routing/debugcli/debugcmd.c
View File

@ -1005,29 +1005,9 @@ static void createServer(DCB *dcb, char *name, char *address, char *port,
if (server_find_by_unique_name(name) == NULL)
{
if (protocol == NULL)
if (server_create(name, address, port, protocol, authenticator, authenticator_options))
{
protocol = "MySQLBackend";
}
SERVER *server = server_alloc(address, protocol, atoi(port), authenticator,
authenticator_options);
if (server)
{
server_set_unique_name(server, name);
if (server_serialize(server))
{
dcb_printf(dcb, "Created server '%s'\n", name);
}
else
{
dcb_printf(dcb, "WARNING: The server was added to the runtime \n"
"configuration but persisting the new server to disk \n"
"failed. This server will NOT be loaded when MaxScale \n"
"is restarted. See log file for more details on why it failed.\n");
}
dcb_printf(dcb, "Created server '%s'\n", name);
}
else
{