From 69be4d263f3265a57bc8d6ef7e9e295a98f3e894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Sat, 20 May 2017 11:04:15 +0300 Subject: [PATCH] MXS-1220: Add admin interface parameters to /maxscale/ resource The admin interface parameters are now a part of the /maxscale/ resource. --- include/maxscale/config.h | 2 -- server/core/config.cc | 13 ++++++++----- server/core/log_manager.cc | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/maxscale/config.h b/include/maxscale/config.h index d402b9ff1..805e2a9ff 100644 --- a/include/maxscale/config.h +++ b/include/maxscale/config.h @@ -75,9 +75,7 @@ extern const char CN_ADDRESS[]; extern const char CN_ADMIN_AUTH[]; extern const char CN_ADMIN_ENABLED[]; extern const char CN_ADMIN_HOST[]; -extern const char CN_ADMIN_PASSWORD[]; extern const char CN_ADMIN_PORT[]; -extern const char CN_ADMIN_USER[]; extern const char CN_ADMIN_SSL_KEY[]; extern const char CN_ADMIN_SSL_CERT[]; extern const char CN_ADMIN_SSL_CA_CERT[]; diff --git a/server/core/config.cc b/server/core/config.cc index 4f957fe35..8b130c559 100644 --- a/server/core/config.cc +++ b/server/core/config.cc @@ -59,9 +59,7 @@ const char CN_ADDRESS[] = "address"; const char CN_ADMIN_AUTH[] = "admin_auth"; const char CN_ADMIN_ENABLED[] = "admin_enabled"; const char CN_ADMIN_HOST[] = "admin_host"; -const char CN_ADMIN_PASSWORD[] = "admin_password"; const char CN_ADMIN_PORT[] = "admin_port"; -const char CN_ADMIN_USER[] = "admin_user"; const char CN_ADMIN_SSL_KEY[] = "admin_ssl_key"; const char CN_ADMIN_SSL_CERT[] = "admin_ssl_cert"; const char CN_ADMIN_SSL_CA_CERT[] = "admin_ssl_ca_cert"; @@ -3880,9 +3878,14 @@ json_t* config_maxscale_to_json(const char* host) json_object_set_new(param, CN_AUTH_READ_TIMEOUT, json_integer(cnf->auth_read_timeout)); json_object_set_new(param, CN_AUTH_WRITE_TIMEOUT, json_integer(cnf->auth_write_timeout)); json_object_set_new(param, CN_SKIP_PERMISSION_CHECKS, json_boolean(cnf->skip_permission_checks)); - json_object_set_new(param, "syslog", json_boolean(cnf->syslog)); - json_object_set_new(param, "maxlog", json_boolean(cnf->maxlog)); - json_object_set_new(param, "log_to_shm", json_boolean(cnf->log_to_shm)); + json_object_set_new(param, CN_ADMIN_AUTH, json_boolean(cnf->admin_auth)); + json_object_set_new(param, CN_ADMIN_ENABLED, json_boolean(cnf->admin_enabled)); + json_object_set_new(param, CN_ADMIN_HOST, json_string(cnf->admin_host)); + json_object_set_new(param, CN_ADMIN_PORT, json_integer(cnf->admin_port)); + 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_QUERY_CLASSIFIER, json_string(cnf->qc_name)); if (cnf->qc_args) diff --git a/server/core/log_manager.cc b/server/core/log_manager.cc index 70f918534..3176481f0 100644 --- a/server/core/log_manager.cc +++ b/server/core/log_manager.cc @@ -3033,6 +3033,7 @@ json_t* mxs_logs_to_json(const char* host) json_object_set_new(param, "log_notice", json_boolean(mxs_log_priority_is_enabled(LOG_NOTICE))); json_object_set_new(param, "log_info", json_boolean(mxs_log_priority_is_enabled(LOG_INFO))); json_object_set_new(param, "log_debug", json_boolean(mxs_log_priority_is_enabled(LOG_DEBUG))); + json_object_set_new(param, "log_to_shm", json_boolean(config_get_global_options()->log_to_shm)); json_t* attr = json_object(); json_object_set_new(attr, CN_PARAMETERS, param);