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

Remove default values for protocol

Browse Source 
The parameter is the module name so it needs to be in the configuration.
This commit is contained in:
Markus Mäkelä
2018-08-29 01:49:16 +03:00
parent e260d493fd
commit 73288829b5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/config.cc
View File

@ -293,10 +293,10 @@ const MXS_MODULE_PARAM config_listener_params[] =
{ {
{CN_TYPE, MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_OPT_REQUIRED}, {CN_TYPE, MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_OPT_REQUIRED},
{CN_SERVICE, MXS_MODULE_PARAM_SERVICE, NULL, MXS_MODULE_OPT_REQUIRED}, {CN_SERVICE, MXS_MODULE_PARAM_SERVICE, NULL, MXS_MODULE_OPT_REQUIRED},
{CN_PROTOCOL, MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_OPT_REQUIRED},
{CN_PORT, MXS_MODULE_PARAM_COUNT}, // Either port or socket, checked when created {CN_PORT, MXS_MODULE_PARAM_COUNT}, // Either port or socket, checked when created
{CN_SOCKET, MXS_MODULE_PARAM_STRING}, {CN_SOCKET, MXS_MODULE_PARAM_STRING},
{CN_AUTHENTICATOR_OPTIONS, MXS_MODULE_PARAM_STRING}, {CN_AUTHENTICATOR_OPTIONS, MXS_MODULE_PARAM_STRING},
{CN_PROTOCOL, MXS_MODULE_PARAM_STRING, "MariaDBClient"},
{CN_ADDRESS, MXS_MODULE_PARAM_STRING, "::"}, {CN_ADDRESS, MXS_MODULE_PARAM_STRING, "::"},
{CN_AUTHENTICATOR, MXS_MODULE_PARAM_STRING}, {CN_AUTHENTICATOR, MXS_MODULE_PARAM_STRING},
{CN_SSL, MXS_MODULE_PARAM_ENUM, "false", MXS_MODULE_OPT_ENUM_UNIQUE, ssl_values}, {CN_SSL, MXS_MODULE_PARAM_ENUM, "false", MXS_MODULE_OPT_ENUM_UNIQUE, ssl_values},
@ -351,7 +351,7 @@ const MXS_MODULE_PARAM config_server_params[] =
{ {
{CN_TYPE, MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_OPT_REQUIRED}, {CN_TYPE, MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_OPT_REQUIRED},
{CN_ADDRESS, MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_OPT_REQUIRED}, {CN_ADDRESS, MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_OPT_REQUIRED},
{CN_PROTOCOL, MXS_MODULE_PARAM_STRING, "MariaDBBackend"}, {CN_PROTOCOL, MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_OPT_REQUIRED},
{CN_PORT, MXS_MODULE_PARAM_COUNT, "3306"}, {CN_PORT, MXS_MODULE_PARAM_COUNT, "3306"},
{CN_AUTHENTICATOR, MXS_MODULE_PARAM_STRING}, {CN_AUTHENTICATOR, MXS_MODULE_PARAM_STRING},
{CN_MONITORUSER, MXS_MODULE_PARAM_STRING}, {CN_MONITORUSER, MXS_MODULE_PARAM_STRING},

2
server/core/config_runtime.cc
View File

@ -222,6 +222,8 @@ bool runtime_create_server(const char *name, const char *address, const char *po
if (ok) if (ok)
{ {
config_replace_param(&ctx, CN_PROTOCOL, protocol);
if (address) if (address)
{ {
config_replace_param(&ctx, "address", address); config_replace_param(&ctx, "address", address);