diff options
| author | Mickaël Rémond <mickael.remond@process-one.net> | 2008-03-17 10:16:21 +0000 |
|---|---|---|
| committer | Mickaël Rémond <mickael.remond@process-one.net> | 2008-03-17 10:16:21 +0000 |
| commit | 320c26627634300caca99215709e2b0eee8663e4 (patch) | |
| tree | 837feb819946e357669d25f2c5568aca9cf961d8 /src | |
| parent | * src/ejabberd_ctl.erl: API improvement: Added reopen_log_hook (EJAB-565) (diff) | |
* src/ejabberd_s2s.erl: Only trigger s2s_connect_hook on successful connection (EJAB-566)
* src/ejabberd_s2s_out.erl: Likewise
SVN Revision: 1235
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_s2s.erl | 1 | ||||
| -rw-r--r-- | src/ejabberd_s2s_out.erl | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl index 59ce83205..eebee741b 100644 --- a/src/ejabberd_s2s.erl +++ b/src/ejabberd_s2s.erl @@ -359,7 +359,6 @@ new_connection(MyServer, Server, From, FromTo, TRes = mnesia:transaction(F), case TRes of {atomic, Pid} -> - ejabberd_hooks:run(s2s_connect_hook, [MyServer, Server]), ejabberd_s2s_out:start_connection(Pid); _ -> ejabberd_s2s_out:stop_connection(Pid) diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 694e0d283..8eddc41eb 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -312,6 +312,9 @@ wait_for_validation({xmlstreamelement, El}, StateData) -> send_queue(StateData, StateData#state.queue), ?INFO_MSG("Connection established: ~s -> ~s", [StateData#state.myname, StateData#state.server]), + ejabberd_hooks:run(s2s_connect_hook, + [StateData#state.myname, + StateData#state.server]), {next_state, stream_established, StateData#state{queue = queue:new()}}; _ -> @@ -420,6 +423,9 @@ wait_for_features({xmlstreamelement, El}, StateData) -> send_queue(StateData, StateData#state.queue), ?INFO_MSG("Connection established: ~s -> ~s", [StateData#state.myname, StateData#state.server]), + ejabberd_hooks:run(s2s_connect_hook, + [StateData#state.myname, + StateData#state.server]), {next_state, stream_established, StateData#state{queue = queue:new()}}; SASLEXT and StateData#state.try_auth and |