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

MXS-1220: Implement JSON diagnostics entry point in autheticators

Browse Source 
All autheticators now implement the JSON version of the diagnostics
function.
This commit is contained in:
Markus Mäkelä
2017-04-18 06:39:32 +03:00
committed by Markus Mäkelä
parent 5e679aa167
commit 4804c975ad
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/core/users.cc
View File

@ -109,32 +109,28 @@ void usersPrint(const USERS *users)
hashtable_stats(users->data);
}
void users_default_diagnostic(DCB *dcb, SERV_LISTENER *port)
json_t* users_default_diagnostic(SERV_LISTENER *port)
{
json_t* rval = json_array();
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;
char* user;
while ((user = hashtable_next(iter)) != NULL)
while ((user = (char*)hashtable_next(iter)))
{
dcb_printf(dcb, "%s%s", sep, (char *)user);
sep = ", ";
json_array_append(rval, json_string(user));
}
dcb_printf(dcb, "\n");
hashtable_iterator_free(iter);
}
}
else
{
dcb_printf(dcb, "Users table is empty\n");
}
return rval;
}
int users_default_loadusers(SERV_LISTENER *port)