diff options
| author | Mickaël Rémond <mickael.remond@process-one.net> | 2007-03-13 18:01:27 +0300 |
|---|---|---|
| committer | Mickaël Rémond <mickael.remond@process-one.net> | 2007-03-13 18:01:27 +0300 |
| commit | a1d0e7d7cb55b3ac9ad834e9b902ad04238a2582 (patch) | |
| tree | a5e7f5147b05d6d5dc188b7addd5c589f1250d54 | |
| parent | 44d3ea9c426d4021954435d5a1d4d58514772244 (diff) | |
* src/ejabberd_service.erl: Add extra info in the log about which
components is connected and which Erlang process is handling
it. This is usefull in context where many types of components are
used (Thanks to Jerome Sautret) (EJAB-211).
SVN Revision: 743
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/ejabberd_service.erl | 25 |
2 files changed, 23 insertions, 9 deletions
@@ -1,3 +1,10 @@ +2007-03-13 Mickael Remond <mickael.remond@process-one.net> + + * src/ejabberd_service.erl: Add extra info in the log about which + components is connected and which Erlang process is handling + it. This is usefull in context where many types of components are + used (Thanks to Jerome Sautret) (EJAB-211). + 2007-03-10 Mickael Remond <mickael.remond@process-one.net> * src/web/ejabberd_http.erl: Support for binaries in ejabberd HTTP diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl index dbc5c1682..6ebea37cd 100644 --- a/src/ejabberd_service.erl +++ b/src/ejabberd_service.erl @@ -1,7 +1,7 @@ %%%---------------------------------------------------------------------- %%% File : ejabberd_service.erl %%% Author : Alexey Shchepin <alexey@sevcom.net> -%%% Purpose : +%%% Purpose : %%% Created : 6 Dec 2002 by Alexey Shchepin <alexey@sevcom.net> %%% Id : $Id$ %%%---------------------------------------------------------------------- @@ -35,6 +35,7 @@ -record(state, {socket, sockmod, streamid, hosts, password, access}). +-record(socket_state, {sockmod, socket, receiver}). %-define(DBGFSM, true). @@ -91,9 +92,15 @@ socket_type() -> %% Returns: {ok, StateName, StateData} | %% {ok, StateName, StateData, Timeout} | %% ignore | -%% {stop, StopReason} +%% {stop, StopReason} %%---------------------------------------------------------------------- init([{SockMod, Socket}, Opts]) -> + ?INFO_MSG("External service connected on receiver ~p,~n~p:~n~p~n", + [Socket#socket_state.receiver, + Socket#socket_state.socket, + {erlang:port_info(Socket#socket_state.socket), + inet:sockname(Socket#socket_state.socket), + inet:peername(Socket#socket_state.socket)}]), Access = case lists:keysearch(access, 1, Opts) of {value, {_, A}} -> A; _ -> all @@ -135,7 +142,7 @@ init([{SockMod, Socket}, Opts]) -> %% Func: StateName/2 %% Returns: {next_state, NextStateName, NextStateData} | %% {next_state, NextStateName, NextStateData, Timeout} | -%% {stop, Reason, NewStateData} +%% {stop, Reason, NewStateData} %%---------------------------------------------------------------------- wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) -> @@ -172,7 +179,8 @@ wait_for_handshake({xmlstreamelement, El}, StateData) -> send_text(StateData, "<handshake/>"), lists:foreach( fun(H) -> - ejabberd_router:register_route(H) + ejabberd_router:register_route(H), + ?INFO_MSG("Route registered for service ~p~n", [H]) end, StateData#state.hosts), {next_state, stream_established, StateData}; _ -> @@ -245,7 +253,7 @@ stream_established(closed, StateData) -> %% {reply, Reply, NextStateName, NextStateData} | %% {reply, Reply, NextStateName, NextStateData, Timeout} | %% {stop, Reason, NewStateData} | -%% {stop, Reason, Reply, NewStateData} +%% {stop, Reason, Reply, NewStateData} %%---------------------------------------------------------------------- %state_name(Event, From, StateData) -> % Reply = ok, @@ -255,7 +263,7 @@ stream_established(closed, StateData) -> %% Func: handle_event/3 %% Returns: {next_state, NextStateName, NextStateData} | %% {next_state, NextStateName, NextStateData, Timeout} | -%% {stop, Reason, NewStateData} +%% {stop, Reason, NewStateData} %%---------------------------------------------------------------------- handle_event(_Event, StateName, StateData) -> {next_state, StateName, StateData}. @@ -267,7 +275,7 @@ handle_event(_Event, StateName, StateData) -> %% {reply, Reply, NextStateName, NextStateData} | %% {reply, Reply, NextStateName, NextStateData, Timeout} | %% {stop, Reason, NewStateData} | -%% {stop, Reason, Reply, NewStateData} +%% {stop, Reason, Reply, NewStateData} %%---------------------------------------------------------------------- handle_sync_event(_Event, _From, StateName, StateData) -> Reply = ok, @@ -280,7 +288,7 @@ code_change(_OldVsn, StateName, StateData, _Extra) -> %% Func: handle_info/3 %% Returns: {next_state, NextStateName, NextStateData} | %% {next_state, NextStateName, NextStateData, Timeout} | -%% {stop, Reason, NewStateData} +%% {stop, Reason, NewStateData} %%---------------------------------------------------------------------- handle_info({send_text, Text}, StateName, StateData) -> send_text(StateData, Text), @@ -335,4 +343,3 @@ send_element(StateData, El) -> new_id() -> randoms:get_string(). - |