diff options
| -rw-r--r-- | src/ejabberd_admin.erl | 20 | ||||
| -rw-r--r-- | src/ejd2odbc.erl | 2 | ||||
| -rw-r--r-- | src/mod_admin_extra.erl | 30 |
3 files changed, 5 insertions, 47 deletions
diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl index 8b6e27b82..89421d996 100644 --- a/src/ejabberd_admin.erl +++ b/src/ejabberd_admin.erl @@ -42,7 +42,6 @@ %% Purge DB delete_expired_messages/0, delete_old_messages/1, %% Mnesia - export2odbc/2, set_master/1, backup_mnesia/1, restore_mnesia/1, dump_mnesia/1, dump_table/2, load_mnesia/1, @@ -191,7 +190,7 @@ commands() -> #ejabberd_commands{name = export2odbc, tags = [mnesia], desc = "Export virtual host information from Mnesia tables to SQL files", - module = ?MODULE, function = export2odbc, + module = ejd2odbc, function = export, args = [{host, string}, {directory, string}], result = {res, rescode}}, #ejabberd_commands{name = set_master, tags = [mnesia], @@ -408,23 +407,6 @@ delete_old_messages(Days) -> %%% Mnesia management %%% -export2odbc(Host, Directory) -> - Tables = [{export_last, last}, - {export_offline, offline}, - {export_private_storage, private_storage}, - {export_roster, roster}, - {export_vcard, vcard}, - {export_vcard_search, vcard_search}, - {export_passwd, passwd}], - Export = fun({TableFun, Table}) -> - Filename = filename:join([Directory, atom_to_list(Table)++".txt"]), - io:format("Trying to export Mnesia table '~p' on Host '~s' to file '~s'~n", [Table, Host, Filename]), - Res = (catch ejd2odbc:TableFun(Host, Filename)), - io:format(" Result: ~p~n", [Res]) - end, - lists:foreach(Export, Tables), - ok. - set_master("self") -> set_master(node()); set_master(NodeString) when is_list(NodeString) -> diff --git a/src/ejd2odbc.erl b/src/ejd2odbc.erl index cc6241925..81c4b0fde 100644 --- a/src/ejd2odbc.erl +++ b/src/ejd2odbc.erl @@ -55,7 +55,7 @@ modules() -> mod_offline, mod_privacy, mod_private, - mod_pubsub, + %% mod_pubsub, mod_roster, mod_shared_roster, mod_vcard, diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl index 0cb763bd9..6fbf762eb 100644 --- a/src/mod_admin_extra.erl +++ b/src/mod_admin_extra.erl @@ -31,7 +31,7 @@ -include("logger.hrl"). -export([start/2, stop/1, compile/1, get_cookie/0, - remove_node/1, export2odbc/2, set_password/3, + remove_node/1, set_password/3, check_password_hash/4, delete_old_users/1, delete_old_users_vhost/2, ban_account/3, num_active_users/2, num_resources/2, resource_num/3, @@ -112,11 +112,6 @@ commands() -> module = ?MODULE, function = remove_node, args = [{node, string}], result = {res, rescode}}, - #ejabberd_commands{name = export2odbc, tags = [mnesia], %% Copied to ejabberd 2.1.x after 11 - desc = "Export Mnesia tables to files in directory", - module = ?MODULE, function = export2odbc, - args = [{host, string}, {path, string}], - result = {res, rescode}}, #ejabberd_commands{name = num_active_users, tags = [accounts, stats], desc = "Get number of users active in the last days", @@ -233,7 +228,7 @@ commands() -> tags = [session], desc = "Get the list of established sessions in a vhost", module = ?MODULE, function = connected_users_vhost, - args = [{host, string}], + args = [{host, binary}], result = {connected_users_vhost, {list, {sessions, string}}}}, #ejabberd_commands{name = user_sessions_info, tags = [session], @@ -388,7 +383,7 @@ commands() -> #ejabberd_commands{name = push_alltoall, tags = [roster], desc = "Add all the users to all the users of Host in Group", module = ?MODULE, function = push_alltoall, - args = [{host, string}, {group, string}], + args = [{host, binary}, {group, binary}], result = {res, rescode}}, #ejabberd_commands{name = get_last, tags = [last], @@ -505,25 +500,6 @@ remove_node(Node) -> mnesia:del_table_copy(schema, list_to_atom(Node)), ok. -export2odbc(Host, Directory) -> - Tables = [ - {export_last, last}, - {export_offline, offline}, - {export_passwd, passwd}, - {export_private_storage, private_storage}, - {export_roster, roster}, - {export_vcard, vcard}, - {export_vcard_search, vcard_search}], - Export = fun({TableFun, Table}) -> - Filename = filename:join([Directory, atom_to_list(Table)++".txt"]), - io:format("Trying to export Mnesia table '~p' on Host '~s' to file '~s'~n", [Table, Host, Filename]), - Res = (catch ejd2odbc:TableFun(Host, Filename)), - io:format(" Result: ~p~n", [Res]) - end, - lists:foreach(Export, Tables), - ok. - - %%% %%% Accounts %%% |