Addition of hashtable iterator

User print routine

rejig of show users to show dbusers and a new show users command in the debugcli
This commit is contained in:
Mark Riddoch
2013-07-23 12:16:22 +02:00
parent 36f62637c9
commit 016e759b2b
6 changed files with 126 additions and 1 deletions

View File

@ -75,6 +75,7 @@ struct subcommand {
int arg_types[3];
};
static void telnetdShowUsers(DCB *);
/**
* The subcommands of the show command
*/
@ -97,7 +98,9 @@ struct subcommand showoptions[] = {
{ARG_TYPE_ADDRESS, 0, 0} },
{ "epoll", 0, dprintPollStats, "Show the poll statistics",
{0, 0, 0} },
{ "users", 1, dcb_usersPrint, "Show statistics for a users table",
{ "dbusers", 1, dcb_usersPrint, "Show statistics and user names for a service's user table",
{ARG_TYPE_ADDRESS, 0, 0} },
{ "users", 0, telnetdShowUsers, "Show statistics and user names for the debug interface",
{ARG_TYPE_ADDRESS, 0, 0} },
{ NULL, 0, NULL, NULL,
{0, 0, 0} }
@ -503,3 +506,15 @@ char *err;
else
dcb_printf(dcb, "Failed to add new user. %s\n", err);
}
/**
* Print the adminsitration users
*
* @param dcb The DCB to print the user data to
*/
static void
telnetdShowUsers(DCB *dcb)
{
dcb_printf(dcb, "Administration interface users:\n");
dcb_PrintAdminUsers(dcb);
}