diff options
| author | Badlop <badlop@process-one.net> | 2008-06-29 11:59:06 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2008-06-29 11:59:06 +0000 |
| commit | 2ccf410a7574bdb76402f75849841425322a6887 (patch) | |
| tree | 156bfd05e74b023521823704f8b925eb0918d7db | |
| parent | * src/mod_pubsub/node_pep.erl: Complain if mod_caps disabled and (diff) | |
* src/ejabberd_ctl.erl: Web Admin and Ad-hoc admin: dump only
persistent tables (EJAB-678)
SVN Revision: 1387
Diffstat (limited to '')
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/ejabberd_ctl.erl | 1 | ||||
| -rw-r--r-- | src/mod_configure.erl | 2 | ||||
| -rw-r--r-- | src/web/ejabberd_web_admin.erl | 2 |
4 files changed, 6 insertions, 2 deletions
@@ -1,5 +1,8 @@ 2008-06-29 Badlop <badlop@process-one.net> + * 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 7cb36141..9a84b592 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 625e380c..e012794d 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 abc1ac87..d133fa14 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, |