Fix for /sessions URI and addition of /clients URI

This commit is contained in:
Mark Riddoch
2015-02-20 14:04:16 +00:00
parent 7d07e5dd8a
commit dd843784e8

View File

@ -54,7 +54,7 @@
MODULE_INFO info = { MODULE_INFO info = {
MODULE_API_ROUTER, MODULE_API_ROUTER,
MODULE_GA, MODULE_ALPHA_RELEASE,
ROUTER_VERSION, ROUTER_VERSION,
"The MaxScale Information Schema" "The MaxScale Information Schema"
}; };
@ -664,6 +664,26 @@ PARSE_ERROR err;
return 1; return 1;
} }
/**
* Session all result set
* @return A resultset for all sessions
*/
static RESULTSET *
maxinfoSessionsAll()
{
return sessionGetList(SESSION_LIST_ALL);
}
/**
* Client session result set
* @return A resultset for all sessions
*/
static RESULTSET *
maxinfoClientSessions()
{
return sessionGetList(SESSION_LIST_CONNECTION);
}
typedef RESULTSET *(*RESULTSETFUNC)(); typedef RESULTSET *(*RESULTSETFUNC)();
/** /**
@ -678,7 +698,8 @@ static struct uri_table {
{ "/listeners", serviceGetListenerList }, { "/listeners", serviceGetListenerList },
{ "/modules", moduleGetList }, { "/modules", moduleGetList },
{ "/monitors", monitorGetList }, { "/monitors", monitorGetList },
{ "/sessions", sessionGetList }, { "/sessions", maxinfoSessionsAll },
{ "/clients", maxinfoClientSessions },
{ "/servers", serverGetList }, { "/servers", serverGetList },
{ "/variables", maxinfo_variables }, { "/variables", maxinfo_variables },
{ "/status", maxinfo_status }, { "/status", maxinfo_status },