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

Fix JSON representation of Listener parameters

Browse Source 
The parameters were still hard-coded and not generated from the actual
parameters.
This commit is contained in:
Markus Mäkelä
2019-05-24 11:05:35 +03:00
parent 47ebcdcc02
commit 075ad1cfb3
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/core/listener.cc
View File

@ -531,16 +531,13 @@ bool listener_serialize(const SListener& listener)
json_t* Listener::to_json() const json_t* Listener::to_json() const
{ {
json_t* param = json_object(); json_t* param = json_object();
json_object_set_new(param, "address", json_string(m_address.c_str()));
json_object_set_new(param, "port", json_integer(m_port));
json_object_set_new(param, "protocol", json_string(m_protocol.c_str()));
json_object_set_new(param, "authenticator", json_string(m_authenticator.c_str()));
json_object_set_new(param, "auth_options", json_string(m_auth_options.c_str()));
if (m_ssl_context) const MXS_MODULE* mod = get_module(m_protocol.c_str(), MODULE_PROTOCOL);
{ config_add_module_params_json(&m_params,
json_object_set_new(param, "ssl", m_ssl_context->to_json()); {CN_TYPE, CN_SERVICE},
} config_server_params,
mod->parameters,
param);
json_t* attr = json_object(); json_t* attr = json_object();
json_object_set_new(attr, CN_STATE, json_string(state())); json_object_set_new(attr, CN_STATE, json_string(state()));