diff options
| author | Mickaël Rémond <mremond@process-one.net> | 2016-08-01 15:36:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-01 15:36:47 +0200 |
| commit | 2ef58a33a9c3384429508bac60db8c322f4fc782 (patch) | |
| tree | 5aaeefc8302746943c7f584ca16a95fce86e747e /src/ejabberd_admin.erl | |
| parent | Remove compile warning (diff) | |
| parent | Improve error message when try to call api on api root (diff) | |
Merge pull request #1223 from processone/expand_api
More API fixes and improvements
Diffstat (limited to 'src/ejabberd_admin.erl')
| -rw-r--r-- | src/ejabberd_admin.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl index f20aeebf0..615459f77 100644 --- a/src/ejabberd_admin.erl +++ b/src/ejabberd_admin.erl @@ -87,6 +87,7 @@ get_commands_spec() -> args = [], result = {res, rescode}}, #ejabberd_commands{name = reopen_log, tags = [logs, server], desc = "Reopen the log files", + policy = admin, module = ?MODULE, function = reopen_log, args = [], result = {res, rescode}}, #ejabberd_commands{name = rotate_log, tags = [logs, server], @@ -380,13 +381,12 @@ register(User, Host, Password) -> {atomic, ok} -> {ok, io_lib:format("User ~s@~s successfully registered", [User, Host])}; {atomic, exists} -> - String = io_lib:format("User ~s@~s already registered at node ~p", - [User, Host, node()]), - {exists, String}; + Msg = io_lib:format("User ~s@~s already registered", [User, Host]), + {error, conflict, 10090, Msg}; {error, Reason} -> String = io_lib:format("Can't register user ~s@~s at node ~p: ~p", [User, Host, node(), Reason]), - {cannot_register, String} + {error, cannot_register, 10001, String} end. unregister(User, Host) -> |