mirror of
https://github.com/processone/ejabberd.git
synced 2024-09-27 14:30:55 +02:00
* src/ejabberd_s2s_out.erl: Improve confusing log message in s2s
connection: wait_for_validation connect timeout (EJAB-617) SVN Revision: 1311
This commit is contained in:
parent
e5879f4349
commit
ef531fb208
@ -1,5 +1,8 @@
|
|||||||
2008-04-29 Badlop <badlop@process-one.net>
|
2008-04-29 Badlop <badlop@process-one.net>
|
||||||
|
|
||||||
|
* src/ejabberd_s2s_out.erl: Improve confusing log message in s2s
|
||||||
|
connection: wait_for_validation connect timeout (EJAB-617)
|
||||||
|
|
||||||
* src/ejabberd.cfg.example: Small improvements in explanations
|
* src/ejabberd.cfg.example: Small improvements in explanations
|
||||||
|
|
||||||
* doc/guide.tex: Document MUC room options (EJAB-619)
|
* doc/guide.tex: Document MUC room options (EJAB-619)
|
||||||
|
@ -375,6 +375,14 @@ wait_for_validation({xmlstreamerror, _}, StateData) ->
|
|||||||
?INVALID_XML_ERR ++ ?STREAM_TRAILER),
|
?INVALID_XML_ERR ++ ?STREAM_TRAILER),
|
||||||
{stop, normal, StateData};
|
{stop, normal, StateData};
|
||||||
|
|
||||||
|
wait_for_validation(timeout, #state{verify = {VPid, VKey, SID}} = StateData)
|
||||||
|
when is_pid(VPid) and is_list(VKey) and is_list(SID) ->
|
||||||
|
%% This is an auxiliary s2s connection for dialback.
|
||||||
|
%% This timeout is normal and doesn't represent a problem.
|
||||||
|
?DEBUG("wait_for_validation: ~s -> ~s (timeout in verify connection)",
|
||||||
|
[StateData#state.myname, StateData#state.server]),
|
||||||
|
{stop, normal, StateData};
|
||||||
|
|
||||||
wait_for_validation(timeout, StateData) ->
|
wait_for_validation(timeout, StateData) ->
|
||||||
?INFO_MSG("wait_for_validation: ~s -> ~s (connect timeout)",
|
?INFO_MSG("wait_for_validation: ~s -> ~s (connect timeout)",
|
||||||
[StateData#state.myname, StateData#state.server]),
|
[StateData#state.myname, StateData#state.server]),
|
||||||
|
Loading…
Reference in New Issue
Block a user