* src/ejabberd_s2s.erl: Only trigger s2s_connect_hook on successful connection (EJAB...

* src/ejabberd_s2s_out.erl: Likewise

SVN Revision: 1235

diff --git a/ChangeLog b/ChangeLog
index 58a67788a1af59a0d9cad71ade527a3e5324eab3..c8fdaf20487c5481596074a40594b9ce67dfa112 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-17  Mickael Remond  <mremond@process-one.net>
+
+       * src/ejabberd_s2s.erl: Only trigger s2s_connect_hook on
+       successful connection (EJAB-566)
+       * src/ejabberd_s2s_out.erl: Likewise
+
 2008-03-15  Mickael Remond  <mremond@process-one.net>
 
        * src/ejabberd_ctl.erl: API improvement: Added

diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl
index 59ce832057bfefa9953c82537fad0c25fdc9662b..eebee741be6e8af8b063250159e892d216d0bfd6 100644 (file)
--- 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 694e0d2834cbd4ecf1ae1259c0bade0f9a1d2835..8eddc41ebf3b97dbfabde076e7013e6bdcd42a56 100644 (file)
--- 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