diff options
| -rw-r--r-- | src/mod_stats.erl | 7 | ||||
| -rw-r--r-- | src/odbc/odbc_queries.erl | 4 | ||||
| -rw-r--r-- | src/web/ejabberd_web_admin.erl | 5 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/mod_stats.erl b/src/mod_stats.erl index 97ba031dd..5c110801d 100644 --- a/src/mod_stats.erl +++ b/src/mod_stats.erl @@ -162,7 +162,12 @@ get_local_stat(_Server, [], Name) when Name == "users/all-hosts/online" -> end; get_local_stat(_Server, [], Name) when Name == "users/all-hosts/total" -> - case catch mnesia:table_info(passwd, size) of + NumUsers = lists:foldl( + fun(Host, Total) -> + ejabberd_auth:get_vh_registered_users_number(Host) + + Total + end, 0, ejabberd_config:get_global_option(hosts)), + case NumUsers of {'EXIT', _Reason} -> ?STATERR("500", "Internal Server Error"); Users -> diff --git a/src/odbc/odbc_queries.erl b/src/odbc/odbc_queries.erl index b614fd790..ab842b66c 100644 --- a/src/odbc/odbc_queries.erl +++ b/src/odbc/odbc_queries.erl @@ -232,10 +232,6 @@ list_users(LServer, [{prefix, Prefix}, users_number(LServer) -> case element(1, ejabberd_config:get_local_option({odbc_server, LServer})) of - mysql -> - ejabberd_odbc:sql_query( - LServer, - "select table_rows from information_schema.tables where table_name='users'"); pgsql -> case ejabberd_config:get_local_option({pgsql_users_number_estimate, LServer}) of true -> diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl index a5503afe9..b595f494e 100644 --- a/src/web/ejabberd_web_admin.erl +++ b/src/web/ejabberd_web_admin.erl @@ -1648,7 +1648,10 @@ su_to_list({Server, User}) -> get_stats(global, Lang) -> OnlineUsers = mnesia:table_info(session, size), - RegisteredUsers = mnesia:table_info(passwd, size), + RegisteredUsers = lists:foldl( + fun(Host, Total) -> + ejabberd_auth:get_vh_registered_users_number(Host) + Total + end, 0, ejabberd_config:get_global_option(hosts)), S2SConns = ejabberd_s2s:dirty_get_connections(), S2SConnections = length(S2SConns), S2SServers = length(lists:usort([element(2, C) || C <- S2SConns])), |