diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2015-11-24 18:44:13 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2015-11-24 18:44:13 +0300 |
| commit | 95265dd3ad8e149d94d08e1a73970fb0bbf55b49 (patch) | |
| tree | a00a134cf0148a121ea505809cef0d9d49799652 /src/ejabberd_system_monitor.erl | |
| parent | Make Riak working on R18 (diff) | |
Move JID related functions to jid.erl (#847)
Diffstat (limited to '')
| -rw-r--r-- | src/ejabberd_system_monitor.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ejabberd_system_monitor.erl b/src/ejabberd_system_monitor.erl index cfe97a73..d1844b80 100644 --- a/src/ejabberd_system_monitor.erl +++ b/src/ejabberd_system_monitor.erl @@ -68,7 +68,7 @@ process_command(From, To, Packet) -> case Name of <<"message">> -> LFrom = - jlib:jid_tolower(jlib:jid_remove_resource(From)), + jid:tolower(jid:remove_resource(From)), case lists:member(LFrom, get_admin_jids()) of true -> Body = xml:get_path_s(Packet, @@ -185,9 +185,9 @@ process_large_heap(Pid, Info) -> io_lib:format("(~w) The process ~w is consuming too " "much memory:~n~p~n~s", [node(), Pid, Info, DetailedInfo])), - From = jlib:make_jid(<<"">>, Host, <<"watchdog">>), + From = jid:make(<<"">>, Host, <<"watchdog">>), lists:foreach(fun (JID) -> - send_message(From, jlib:make_jid(JID), Body) + send_message(From, jid:make(JID), Body) end, JIDs). send_message(From, To, Body) -> @@ -203,8 +203,8 @@ get_admin_jids() -> ejabberd_config:get_option( watchdog_admins, fun(JIDs) -> - [jlib:jid_tolower( - jlib:string_to_jid( + [jid:tolower( + jid:from_string( iolist_to_binary(S))) || S <- JIDs] end, []). @@ -336,7 +336,7 @@ process_remote_command(_) -> throw(unknown_command). opt_type(watchdog_admins) -> fun (JIDs) -> - [jlib:jid_tolower(jlib:string_to_jid(iolist_to_binary(S))) + [jid:tolower(jid:from_string(iolist_to_binary(S))) || S <- JIDs] end; opt_type(watchdog_large_heap) -> |