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

MXS-2304 Cleanup server_alloc()

Browse Source 
Avoids using config_get_string().
This commit is contained in:
Esa Korhonen
2019-02-04 17:33:46 +02:00
parent 78d9ef2910
commit 4b2c0b3edd
1 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
server/core/server.cc
View File

@ -155,7 +155,7 @@ private:
* Concurrent writing should be prevented by the caller. * Concurrent writing should be prevented by the caller.
* *
* @param dest Destination buffer. The buffer is assumed to contains at least a \0 at the end. * @param dest Destination buffer. The buffer is assumed to contains at least a \0 at the end.
* @param max_len Size of destination buffer - 1. The last element (max_len + 1) is never written to. * @param max_len Size of destination buffer - 1. The last element (max_len) is never written to.
* @param source Source string. A maximum of @c max_len characters are copied. * @param source Source string. A maximum of @c max_len characters are copied.
*/ */
void careful_strcpy(char* dest, size_t max_len, const std::string& source) void careful_strcpy(char* dest, size_t max_len, const std::string& source)
@ -185,37 +185,42 @@ void careful_strcpy(char* dest, size_t max_len, const std::string& source)
Server* Server::server_alloc(const char* name, MXS_CONFIG_PARAMETER* params) Server* Server::server_alloc(const char* name, MXS_CONFIG_PARAMETER* params)
{ {
const char* monuser = config_get_string(params, CN_MONITORUSER); auto monuser = params->get_string(CN_MONITORUSER);
const char* monpw = config_get_string(params, CN_MONITORPW); auto monpw = params->get_string(CN_MONITORPW);
if ((*monuser != '\0') != (*monpw != '\0')) const char one_defined_err[] = "'%s is defined for server '%s', '%s' must also be defined.";
if (!monuser.empty() && monpw.empty())
{ {
MXS_ERROR("Both '%s' and '%s' need to be defined for server '%s'", MXS_ERROR(one_defined_err, CN_MONITORUSER, name, CN_MONITORPW);
CN_MONITORUSER, return NULL;
CN_MONITORPW, }
name); else if (monuser.empty() && !monpw.empty())
{
MXS_ERROR(one_defined_err, CN_MONITORPW, name, CN_MONITORUSER);
return NULL; return NULL;
} }
const char* protocol = config_get_string(params, CN_PROTOCOL); auto protocol = params->get_string(CN_PROTOCOL);
const char* authenticator = config_get_string(params, CN_AUTHENTICATOR); auto authenticator = params->get_string(CN_AUTHENTICATOR);
if (!authenticator[0] && !(authenticator = get_default_authenticator(protocol))) if (authenticator.empty())
{
authenticator = get_default_authenticator(protocol.c_str());
if (authenticator.empty())
{ {
MXS_ERROR("No authenticator defined for server '%s' and no default " MXS_ERROR("No authenticator defined for server '%s' and no default "
"authenticator for protocol '%s'.", "authenticator for protocol '%s'.",
name, name, protocol.c_str());
protocol);
return NULL; return NULL;
} }
}
void* auth_instance = NULL; void* auth_instance = NULL;
// Backend authenticators do not have options. // Backend authenticators do not have options.
if (!authenticator_init(&auth_instance, authenticator, NULL)) if (!authenticator_init(&auth_instance, authenticator.c_str(), NULL))
{ {
MXS_ERROR("Failed to initialize authenticator module '%s' for server '%s' ", MXS_ERROR("Failed to initialize authenticator module '%s' for server '%s' ",
authenticator, authenticator.c_str(), name);
name);
return NULL; return NULL;
} }
@ -238,13 +243,12 @@ Server* Server::server_alloc(const char* name, MXS_CONFIG_PARAMETER* params)
return NULL; return NULL;
} }
const char* address = config_get_string(params, CN_ADDRESS); auto address = params->get_string(CN_ADDRESS);
careful_strcpy(server->address, MAX_ADDRESS_LEN, address.c_str());
if (snprintf(server->address, sizeof(server->address), "%s", address) > (int)sizeof(server->address)) if (address.length() > MAX_ADDRESS_LEN)
{ {
MXS_WARNING("Truncated server address '%s' to the maximum size of %lu characters.", MXS_WARNING("Truncated server address '%s' to the maximum size of %i characters.",
address, address.c_str(), MAX_ADDRESS_LEN);
sizeof(server->address));
} }
server->port = params->get_integer(CN_PORT); server->port = params->get_integer(CN_PORT);
@ -259,8 +263,9 @@ Server* Server::server_alloc(const char* name, MXS_CONFIG_PARAMETER* params)
server->last_event = SERVER_UP_EVENT; server->last_event = SERVER_UP_EVENT;
server->status = SERVER_RUNNING; server->status = SERVER_RUNNING;
if (*monuser && *monpw) if (!monuser.empty())
{ {
mxb_assert(!monpw.empty());
server->set_monitor_user(monuser); server->set_monitor_user(monuser);
server->set_monitor_password(monpw); server->set_monitor_password(monpw);
} }