diff options
Diffstat (limited to 'src/ejabberd_ctl.erl')
| -rw-r--r-- | src/ejabberd_ctl.erl | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/src/ejabberd_ctl.erl b/src/ejabberd_ctl.erl index e1bafa2c0..80d66f4cc 100644 --- a/src/ejabberd_ctl.erl +++ b/src/ejabberd_ctl.erl @@ -8,6 +8,7 @@ -module(ejabberd_ctl). -author('alexey@sevcom.net'). +-vsn('$Revision$ '). -export([start/0, init/0, @@ -123,8 +124,7 @@ process(["load", Path]) -> end; process(["restore", Path]) -> - case mnesia:restore(Path, [{keep_tables,keep_tables()}, - {default_op, skip_tables}]) of + case ejabberd_admin:restore(Path) of {atomic, _} -> ?STATUS_SUCCESS; {error, Reason} -> @@ -328,35 +328,3 @@ dump_tab(F, T) -> fun() -> mnesia:match_object(T, W, read) end), lists:foreach( fun(Term) -> io:format(F,"~p.~n", [setelement(1, Term, T)]) end, All). - -%% This function return a list of tables that should be kept from a previous -%% version backup. -%% Obsolete tables or tables created by module who are no longer used are not -%% restored and are ignored. -keep_tables() -> - lists:flatten([acl, passwd, config, local_config, disco_publish, - keep_modules_tables()]). - -%% Return the list of modules tables in use, according to the list of actually -%% loaded modules -keep_modules_tables() -> - lists:map(fun(Module) -> - module_tables(Module) - end, - gen_mod:loaded_modules(?MYNAME)). - -%% TODO: This mapping should probably be moved to a callback function in each -%% module. -%% Mapping between modules and their tables -module_tables(mod_announce) -> [motd, motd_users]; -module_tables(mod_irc) -> [irc_custom]; -module_tables(mod_last) -> [last_activity]; -module_tables(mod_muc) -> [muc_room, muc_registered]; -module_tables(mod_offline) -> [offline_msg]; -module_tables(mod_privacy) -> [privacy]; -module_tables(mod_private) -> [private_storage]; -module_tables(mod_pubsub) -> [pubsub_node]; -module_tables(mod_roster) -> [roster]; -module_tables(mod_shared_roster) -> [sr_group, sr_user]; -module_tables(mod_vcard) -> [vcard, vcard_search]; -module_tables(_Other) -> []. |