Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Code Releases Activity

Emit deprecation warning for SM related listening options

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2017-05-05 12:31:17 +03:00
parent b174e2c9c6
commit f2dc8c0442
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ejabberd_c2s.erl
View File

@ -941,14 +941,20 @@ listen_opt_type(max_stanza_size) ->
end; end;
listen_opt_type(max_fsm_queue) -> listen_opt_type(max_fsm_queue) ->
fun(I) when is_integer(I), I>0 -> I end; fun(I) when is_integer(I), I>0 -> I end;
%% The following hack should be removed in future releases: it is intended
%% for backward compatibility with ejabberd 17.01 or older
listen_opt_type(stream_management) ->
?WARNING_MSG("listening option 'stream_management' is deprecated: "
"use mod_stream_mgmt module", []),
fun(B) when is_boolean(B) -> B end;
listen_opt_type(O) -> listen_opt_type(O) ->
%% This hack should be removed in future releases: it is intended
%% for backward compatibility with ejabberd 17.01 or older
case mod_stream_mgmt:mod_opt_type(O) of case mod_stream_mgmt:mod_opt_type(O) of
L when is_list(L) -> L when is_list(L) ->
[access, shaper, certfile, ciphers, dhfile, cafile, [access, shaper, certfile, ciphers, dhfile, cafile,
protocol_options, tls, tls_compression, starttls, protocol_options, tls, tls_compression, starttls,
starttls_required, tls_verify, zlib, max_fsm_queue] ++ L; starttls_required, tls_verify, zlib, max_fsm_queue];
VFun -> VFun ->
?WARNING_MSG("listening option '~s' is deprecated: use '~s' "
"option from mod_stream_mgmt module", [O, O]),
VFun VFun
end. end.

2
src/mod_stream_mgmt.erl
View File

@ -722,8 +722,6 @@ mod_opt_type(resend_on_timeout) ->
fun(B) when is_boolean(B) -> B; fun(B) when is_boolean(B) -> B;
(if_offline) -> if_offline (if_offline) -> if_offline
end; end;
mod_opt_type(stream_management) ->
fun(B) when is_boolean(B) -> B end;
mod_opt_type(queue_type) -> mod_opt_type(queue_type) ->
fun(ram) -> ram; (file) -> file end; fun(ram) -> ram; (file) -> file end;
mod_opt_type(_) -> mod_opt_type(_) ->