From 971c9ce5a5348cc8d3abb88a3341fef9c4e1f429 Mon Sep 17 00:00:00 2001 From: Badlop Date: Sun, 29 Jun 2008 11:59:06 +0000 Subject: [PATCH] * src/ejabberd_ctl.erl: Web Admin and Ad-hoc admin: dump only persistent tables (EJAB-678) SVN Revision: 1387 --- ChangeLog | 3 +++ src/ejabberd_ctl.erl | 1 + src/mod_configure.erl | 2 +- src/web/ejabberd_web_admin.erl | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f14754c4..2582a8a55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-06-29 Badlop + * src/ejabberd_ctl.erl: Web Admin and Ad-hoc admin: dump only + persistent tables (EJAB-678) + * src/mod_pubsub/node_pep.erl: Complain if mod_caps disabled and mod_pubsub has PEP plugin enabled (EJAB-677) diff --git a/src/ejabberd_ctl.erl b/src/ejabberd_ctl.erl index e5be35426..ae4b64fba 100644 --- a/src/ejabberd_ctl.erl +++ b/src/ejabberd_ctl.erl @@ -30,6 +30,7 @@ -export([start/0, init/0, process/1, + dump_to_textfile/1, register_commands/3, register_commands/4, unregister_commands/3, diff --git a/src/mod_configure.erl b/src/mod_configure.erl index 625e380cd..e012794dd 100644 --- a/src/mod_configure.erl +++ b/src/mod_configure.erl @@ -1416,7 +1416,7 @@ set_form(_From, _Host, ["running nodes", ENode, "backup", "textfile"], _Lang, XD false -> {error, ?ERR_BAD_REQUEST}; {value, {_, [String]}} -> - case rpc:call(Node, mnesia, dump_to_textfile, [String]) of + case rpc:call(Node, ejabberd_ctl, dump_to_textfile, [String]) of {badrpc, _Reason} -> {error, ?ERR_INTERNAL_SERVER_ERROR}; {error, _Reason} -> diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl index 25ea9d237..8decd53e8 100644 --- a/src/web/ejabberd_web_admin.erl +++ b/src/web/ejabberd_web_admin.erl @@ -2022,7 +2022,7 @@ node_backup_parse_query(Node, Query) -> rpc:call(Node, mnesia, install_fallback, [Path]); "dump" -> - rpc:call(Node, mnesia, + rpc:call(Node, ejabberd_ctl, dump_to_textfile, [Path]); "load" -> rpc:call(Node, mnesia,