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

MXS-1220: Add back the old diagnostic entry point

Browse Source 
This makes 2.2 maxadmin backwards compatible with 2.1.
This commit is contained in:
Markus Mäkelä
2017-04-21 12:13:08 +03:00
committed by Markus Mäkelä
parent bab7957952
commit dd68069471
15 changed files with 181 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/core/filter.cc
View File

@ -212,12 +212,7 @@ dprintAllFilters(DCB *dcb)
}
if (ptr->obj && ptr->filter)
{
json_t* json = ptr->obj->diagnostics(ptr->filter, NULL);
if (json)
{
json_decref(json);
}
ptr->obj->diagnostics(ptr->filter, NULL, dcb);
}
else
{
@ -252,12 +247,7 @@ dprintFilter(DCB *dcb, const MXS_FILTER_DEF *filter)
}
if (filter->obj && filter->filter)
{
json_t* json = filter->obj->diagnostics(filter->filter, NULL);
if (json)
{
json_decref(json);
}
filter->obj->diagnostics(filter->filter, NULL, dcb);
}
}
@ -503,7 +493,7 @@ json_t* filter_to_json(const MXS_FILTER_DEF* filter, const char* host)
if (filter->obj && filter->filter)
{
json_t* diag = filter->obj->diagnostics(filter->filter, NULL);
json_t* diag = filter->obj->diagnostics_json(filter->filter, NULL);
if (diag)
{
@ -596,7 +586,11 @@ int FilterSession::clientReply(GWBUF* pPacket)
return m_up.clientReply(pPacket);
}
json_t* FilterSession::diagnostics() const
void FilterSession::diagnostics(DCB *pDcb)
{
}
json_t* FilterSession::diagnostics_json() const
{
return NULL;
}

9
server/core/monitor.cc
View File

@ -477,12 +477,7 @@ monitorShow(DCB *dcb, MXS_MONITOR *monitor)
{
if (monitor->module->diagnostics)
{
json_t* json = monitor->module->diagnostics(monitor);
if (json)
{
json_decref(json);
}
monitor->module->diagnostics(dcb, monitor);
}
else
{
@ -1550,7 +1545,7 @@ json_t* monitor_to_json(const MXS_MONITOR* monitor, const char* host)
if (monitor->handle && monitor->module->diagnostics)
{
json_t* diag = monitor->module->diagnostics(monitor);
json_t* diag = monitor->module->diagnostics_json(monitor);
if (diag)
{

16
server/core/service.cc
View File

@ -1415,12 +1415,7 @@ void dprintService(DCB *dcb, SERVICE *service)
}
if (service->router && service->router_instance)
{
json_t* json = service->router->diagnostics(service->router_instance);
if (json)
{
json_decref(json);
}
service->router->diagnostics(service->router_instance, dcb);
}
dcb_printf(dcb, "\tStarted: %s",
asctime_r(localtime_r(&service->stats.started, &result), timebuf));
@ -2298,12 +2293,7 @@ void service_print_users(DCB *dcb, const SERVICE *service)
{
if (port->listener && port->listener->authfunc.diagnostic)
{
json_t* json = port->listener->authfunc.diagnostic(port);
if (json)
{
json_decref(json);
}
port->listener->authfunc.diagnostic(dcb, port);
}
}
}
@ -2368,7 +2358,7 @@ json_t* service_to_json(const SERVICE* service, const char* host)
if (service->router && service->router_instance)
{
json_t* diag = service->router->diagnostics(service->router_instance);
json_t* diag = service->router->diagnostics_json(service->router_instance);
if (diag)
{

10
server/core/session.cc
View File

@ -533,13 +533,9 @@ dprintSession(DCB *dcb, MXS_SESSION *print_session)
{
dcb_printf(dcb, "\tFilter: %s\n",
print_session->filters[i].filter->name);
json_t* json = print_session->filters[i].filter->obj->diagnostics(print_session->filters[i].instance,
print_session->filters[i].session);
if (json)
{
json_decref(json);
}
print_session->filters[i].filter->obj->diagnostics(print_session->filters[i].instance,
print_session->filters[i].session,
dcb);
}
}
}

30
server/core/users.cc
View File

@ -109,7 +109,35 @@ void usersPrint(const USERS *users)
hashtable_stats(users->data);
}
json_t* users_default_diagnostic(const SERV_LISTENER *port)
void users_default_diagnostic(DCB *dcb, SERV_LISTENER *port)
{
if (port->users && port->users->data)
{
HASHITERATOR *iter = hashtable_iterator(port->users->data);
if (iter)
{
dcb_printf(dcb, "User names: ");
const char *sep = "";
void *user;
while ((user = hashtable_next(iter)) != NULL)
{
dcb_printf(dcb, "%s%s", sep, (char *)user);
sep = ", ";
}
dcb_printf(dcb, "\n");
hashtable_iterator_free(iter);
}
}
else
{
dcb_printf(dcb, "Users table is empty\n");
}
}
json_t* users_default_diagnostic_json(const SERV_LISTENER *port)
{
json_t* rval = json_array();