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

Remove unused code

Browse Source 
The code that required these parameters was not added into 2.3 as it was
not needed.
This commit is contained in:
Markus Mäkelä
2018-11-13 17:03:53 +02:00
parent 3092a744ed
commit f9d18606a8
3 changed files with 0 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Documentation/Getting-Started/Configuration-Guide.md
View File

@ -796,24 +796,6 @@ be completely disabled to prevent access to it.
Log authentication failures for the admin interface. This parameter expects a
boolean value and is enabled by default.
#### `peer_hosts`
The REST API URL of a remote peer MaxScale. This is used to communicate with
other MaxScale instances and can be a required parameter for some other features
in MaxScale.
Note that currently only one URL is supported. Defining more than one is
considered a configuration error.
#### `peer_user`
Username used when connecting to remote MaxScale instances.
#### `peer_password`
Password used when connecting to remote MaxScale instances. This password can be
encrypted with `maxpasswd`.
#### _events_
MaxScale logs warnings and errors for various reasons and often it is self-

3
include/maxscale/config.h
View File

@ -153,9 +153,6 @@ extern const char CN_PARAMETERS[];
extern const char CN_PARSE_RESULT[];
extern const char CN_PASSIVE[];
extern const char CN_PASSWORD[];
extern const char CN_PEER_HOSTS[];
extern const char CN_PEER_PASSWORD[];
extern const char CN_PEER_USER[];
extern const char CN_POLL_SLEEP[];
extern const char CN_PORT[];
extern const char CN_PROTOCOL[];

27
server/core/config.cc
View File

@ -134,9 +134,6 @@ const char CN_PARAMETERS[] = "parameters";
const char CN_PARSE_RESULT[] = "parse_result";
const char CN_PASSIVE[] = "passive";
const char CN_PASSWORD[] = "password";
const char CN_PEER_HOSTS[] = "peer_hosts";
const char CN_PEER_PASSWORD[] = "peer_password";
const char CN_PEER_USER[] = "peer_user";
const char CN_POLL_SLEEP[] = "poll_sleep";
const char CN_PORT[] = "port";
const char CN_PROTOCOL[] = "protocol";
@ -2574,28 +2571,6 @@ static int handle_global_item(const char* name, const char* value)
CN_DUMP_LAST_STATEMENTS);
}
}
else if (strcmp(name, CN_PEER_HOSTS) == 0)
{
if (strchr(value, ','))
{
MXS_ERROR("Only a single host in '%s' is currently supported", CN_PEER_HOSTS);
return 0;
}
else
{
strcpy(gateway.peer_hosts, value);
}
}
else if (strcmp(name, CN_PEER_USER) == 0)
{
strcpy(gateway.peer_user, value);
}
else if (strcmp(name, CN_PEER_PASSWORD) == 0)
{
char* pw = decrypt_password(value);
strcpy(gateway.peer_password, pw);
MXS_FREE(pw);
}
else
{
bool found = false;
@ -4469,8 +4444,6 @@ json_t* config_maxscale_to_json(const char* host)
json_object_set_new(param, CN_ADMIN_SSL_KEY, json_string(cnf->admin_ssl_key));
json_object_set_new(param, CN_ADMIN_SSL_CERT, json_string(cnf->admin_ssl_cert));
json_object_set_new(param, CN_ADMIN_SSL_CA_CERT, json_string(cnf->admin_ssl_ca_cert));
json_object_set_new(param, CN_PEER_HOSTS, json_string(cnf->peer_hosts));
json_object_set_new(param, CN_PEER_USER, json_string(cnf->peer_user));
json_object_set_new(param, CN_PASSIVE, json_boolean(cnf->passive));
json_object_set_new(param, CN_QUERY_CLASSIFIER, json_string(cnf->qc_name));