diff options
| author | Badlop <badlop@process-one.net> | 2008-04-29 16:59:03 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2008-04-29 16:59:03 +0000 |
| commit | ef531fb20826ba5e0f24b147c5ba0871e85773a8 (patch) | |
| tree | fb5c3332fed7a6e09b0dc13c5f9605a1e3e54815 | |
| parent | * src/ejabberd.cfg.example: Small improvements in explanations (diff) | |
* src/ejabberd_s2s_out.erl: Improve confusing log message in s2s
connection: wait_for_validation connect timeout (EJAB-617)
SVN Revision: 1311
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/ejabberd_s2s_out.erl | 8 |
2 files changed, 11 insertions, 0 deletions
@@ -1,5 +1,8 @@ 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 * doc/guide.tex: Document MUC room options (EJAB-619) diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index e5f8ed254..4271e43a6 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -375,6 +375,14 @@ wait_for_validation({xmlstreamerror, _}, StateData) -> ?INVALID_XML_ERR ++ ?STREAM_TRAILER), {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) -> ?INFO_MSG("wait_for_validation: ~s -> ~s (connect timeout)", [StateData#state.myname, StateData#state.server]), |