MXS-1220: Add back the old diagnostic entry point

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

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();