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

Fix monitor credentials parameter names

Browse Source 
The `monitoruser` and `monitorpw` parameters were mislabeled as `monuser`
and `monpw`. To allow backwards compatibility, the `monuser` and `monpw`
still work as aliases for the correct commands.
This commit is contained in:
Markus Mäkelä
2017-06-02 18:59:57 +03:00
parent 3584001281
commit 09a445f1b7
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/core/config_runtime.c
View File

@ -280,12 +280,22 @@ bool runtime_alter_server(SERVER *server, char *key, char *value)
{ {
server_update_port(server, atoi(value)); server_update_port(server, atoi(value));
} }
else if (strcmp(key, "monuser") == 0) else if (strcmp(key, "monuser") == 0 || strcmp(key, "monitoruser") == 0)
{ {
if (strcmp(key, "monuser") == 0)
{
MXS_WARNING("Use of `monuser` is deprecated, use `monitoruser` instead.");
}
server_update_credentials(server, value, server->monpw); server_update_credentials(server, value, server->monpw);
} }
else if (strcmp(key, "monpw") == 0) else if (strcmp(key, "monpw") == 0 || strcmp(key, "monitorpw") == 0)
{ {
if (strcmp(key, "monpw") == 0)
{
MXS_WARNING("Use of `monpw` is deprecated, use `monitorpw` instead.");
}
server_update_credentials(server, server->monuser, value); server_update_credentials(server, server->monuser, value);
} }
else else

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

@ -1495,8 +1495,8 @@ struct subcommand alteroptions[] =
"\n" "\n"
"address Server address\n" "address Server address\n"
"port Server port\n" "port Server port\n"
"monuser Monitor user for this server\n" "monitoruser Monitor user for this server\n"
"monpw Monitor password for this server\n" "monitorpw Monitor password for this server\n"
"ssl Enable SSL, value must be 'required'\n" "ssl Enable SSL, value must be 'required'\n"
"ssl_key Path to SSL private key\n" "ssl_key Path to SSL private key\n"
"ssl_cert Path to SSL certificate\n" "ssl_cert Path to SSL certificate\n"