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

MXS-1220: Treat service listeners as service sub-resources

Browse Source 
The listeners under the /services/:service/listeners collection are now
fully JSON API compliant resources.

The listeners could also be exposed as a /listeners collection to easily
group all listener type resources in one place. This approach does has
some semantical and practical problems, namely the fact that each listener
has a many-to-one relationship with its service and listeners by
themselves can't exist alone.
This commit is contained in:
Markus Mäkelä
2017-05-05 06:38:45 +03:00
parent 1d98b4b67b
commit 08dca8c273
6 changed files with 66 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
server/core/service.cc
View File

@ -2459,6 +2459,21 @@ static inline bool have_active_servers(const SERVICE* service)
return false;
}
json_t* service_listeners_json_data(const SERVICE* service)
{
json_t* arr = json_array();
if (service->ports)
{
for (SERV_LISTENER* p = service->ports; p; p = p->next)
{
json_array_append_new(arr, listener_to_json(p));
}
}
return arr;
}
json_t* service_attributes(const SERVICE* service)
{
json_t* attr = json_object();
@ -2486,21 +2501,9 @@ json_t* service_attributes(const SERVICE* service)
json_object_set_new(attr, "total_connections", json_integer(service->stats.n_sessions));
json_object_set_new(attr, "connections", json_integer(service->stats.n_current));
/** Add service parameters */
/** Add service parameters and listeners */
json_object_set_new(attr, CN_PARAMETERS, service_parameters_to_json(service));
/** Add listeners */
json_t* arr = json_array();
if (service->ports)
{
for (SERV_LISTENER* p = service->ports; p; p = p->next)
{
json_array_append_new(arr, listener_to_json(p));
}
}
json_object_set_new(attr, CN_LISTENERS, arr);
json_object_set_new(attr, CN_LISTENERS, service_listeners_json_data(service));
return attr;
}
@ -2561,6 +2564,17 @@ json_t* service_to_json(const SERVICE* service, const char* host)
return mxs_json_resource(host, MXS_JSON_API_SERVICES, service_json_data(service, host));
}
json_t* service_listeners_to_json(const SERVICE* service, const char* host)
{
/** This needs to be done here as the listeners are sort of sub-resources
* of the service. */
string self = MXS_JSON_API_SERVICES;
self += service->name;
self += "/listeners";
return mxs_json_resource(host, self.c_str(), service_listeners_json_data(service));
}
json_t* service_list_to_json(const char* host)
{
json_t* arr = json_array();