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

MXS-1220: Make /maxscale/ resource conform to JSON API

Browse Source 
The /maxscale/ resource now conforms to the JSON API and a test checks
that it the returned JSON is valid.
This commit is contained in:
Markus Mäkelä
2017-05-04 20:41:45 +03:00
parent 7ce20b75d7
commit 798ee840a8
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
server/core/config.cc
View File

@ -40,6 +40,7 @@
#include <maxscale/spinlock.h> #include <maxscale/spinlock.h>
#include <maxscale/utils.h> #include <maxscale/utils.h>
#include <maxscale/paths.h> #include <maxscale/paths.h>
#include <maxscale/json_api.h>
#include "maxscale/config.h" #include "maxscale/config.h"
#include "maxscale/filter.h" #include "maxscale/filter.h"
@ -3855,20 +3856,24 @@ int config_parse_server_list(const char *servers, char ***output_array)
json_t* config_paths_to_json(const char* host) json_t* config_paths_to_json(const char* host)
{ {
json_t* attr = json_object();
json_object_set_new(attr, "libdir", json_string(get_libdir()));
json_object_set_new(attr, "datadir", json_string(get_datadir()));
json_object_set_new(attr, "process_datadir", json_string(get_process_datadir()));
json_object_set_new(attr, "cachedir", json_string(get_cachedir()));
json_object_set_new(attr, "configdir", json_string(get_configdir()));
json_object_set_new(attr, "config_persistdir", json_string(get_config_persistdir()));
json_object_set_new(attr, "module_configdir", json_string(get_module_configdir()));
json_object_set_new(attr, "piddir", json_string(get_piddir()));
json_object_set_new(attr, "logdir", json_string(get_logdir()));
json_object_set_new(attr, "langdir", json_string(get_langdir()));
json_object_set_new(attr, "execdir", json_string(get_execdir()));
json_object_set_new(attr, "connector_plugindir", json_string(get_connector_plugindir()));
json_t* obj = json_object(); json_t* obj = json_object();
json_object_set_new(obj, CN_ATTRIBUTES, attr);
json_object_set_new(obj, CN_ID, json_string(CN_MAXSCALE));
json_object_set_new(obj, CN_TYPE, json_string(CN_MAXSCALE));
json_object_set_new(obj, "libdir", json_string(get_libdir())); return mxs_json_resource(host, MXS_JSON_API_MAXSCALE, obj);
json_object_set_new(obj, "datadir", json_string(get_datadir()));
json_object_set_new(obj, "process_datadir", json_string(get_process_datadir()));
json_object_set_new(obj, "cachedir", json_string(get_cachedir()));
json_object_set_new(obj, "configdir", json_string(get_configdir()));
json_object_set_new(obj, "config_persistdir", json_string(get_config_persistdir()));
json_object_set_new(obj, "module_configdir", json_string(get_module_configdir()));
json_object_set_new(obj, "piddir", json_string(get_piddir()));
json_object_set_new(obj, "logdir", json_string(get_logdir()));
json_object_set_new(obj, "langdir", json_string(get_langdir()));
json_object_set_new(obj, "execdir", json_string(get_execdir()));
json_object_set_new(obj, "connector_plugindir", json_string(get_connector_plugindir()));
return obj;
} }

1
server/core/test/rest-api/test/schema_validation.js
View File

@ -38,6 +38,7 @@ describe("Individual Resources", function() {
"/monitors/MySQL-Monitor", "/monitors/MySQL-Monitor",
"/filters/Hint", "/filters/Hint",
"/sessions/1", "/sessions/1",
"/maxscale/",
] ]
tests.forEach(function(endpoint) { tests.forEach(function(endpoint) {