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

MXS-1220: Implement /sessions/ resource

Browse Source 
The /sessions/ resource was not implemented due to changes in the core
polling mechanics. With the new worker thread messaging system, sessions
can be listed in a safe manner.
This commit is contained in:
Markus Mäkelä
2017-04-22 08:47:42 +03:00
committed by Markus Mäkelä
parent cd6e0ab5e9
commit 690d592a94
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/maxscale/session.h
View File

@ -423,4 +423,13 @@ void session_clear_stmt(MXS_SESSION *session);
*/
json_t* session_to_json(const MXS_SESSION *session, const char* host);
/**
* @brief Convert all sessions to JSON
*
* @param host Hostname of this server
*
* @return A JSON array with all sessions
*/
json_t* session_list_to_json(const char* host);
MXS_END_DECLS

3
server/core/resource.cc
View File

@ -228,8 +228,7 @@ HttpResponse cb_get_monitor(const HttpRequest& request)
HttpResponse cb_all_sessions(const HttpRequest& request)
{
// TODO: Implement this
return HttpResponse(MHD_HTTP_OK);
return HttpResponse(MHD_HTTP_OK, session_list_to_json(request.host()));
}
HttpResponse cb_get_session(const HttpRequest& request)

20
server/core/session.cc
View File

@ -1059,3 +1059,23 @@ json_t* session_to_json(const MXS_SESSION *session, const char *host)
return rval;
}
struct SessionListData
{
json_t* json;
const char* host;
};
bool seslist_cb(DCB* dcb, void* data)
{
SessionListData* d = (SessionListData*)data;
json_array_append_new(d->json, session_to_json(dcb->session, d->host));
return true;
}
json_t* session_list_to_json(const char* host)
{
SessionListData data = {json_array(), host};
dcb_foreach(seslist_cb, &data);
return data.json;
}