diff options
| author | Konstantinos Kallas <konstantinos.kallas@hotmail.com> | 2017-07-26 09:54:23 +0300 |
|---|---|---|
| committer | Konstantinos Kallas <konstantinos.kallas@hotmail.com> | 2017-07-26 09:54:23 +0300 |
| commit | 61d1411ab3321b437f6741703405860d18c82b93 (patch) | |
| tree | 44481834335fb872eee63e205e81417fa26249d5 /src/ejabberd_s2s_out.erl | |
| parent | Add an erl_opt so that rsa can be used when the otp version is enough (diff) | |
| parent | Update oauth2 dependency (diff) | |
Sync fork with upstream
Diffstat (limited to 'src/ejabberd_s2s_out.erl')
| -rw-r--r-- | src/ejabberd_s2s_out.erl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index bcacd8e77..e8cad9792 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -54,10 +54,13 @@ %%%=================================================================== start(From, To, Opts) -> case proplists:get_value(supervisor, Opts, true) of - true -> - supervisor:start_child(ejabberd_s2s_out_sup, - [From, To, Opts]); - _ -> + true -> + case supervisor:start_child(ejabberd_s2s_out_sup, + [From, To, Opts]) of + {ok, undefined} -> ignore; + Res -> Res + end; + _ -> xmpp_stream_out:start(?MODULE, [ejabberd_socket, From, To, Opts], ejabberd_config:fsm_limit_opts([])) end. |