Skip to content

Fix OTP29 compilation #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NelsonVides wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix OTP29 compilation #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/ranch_conns_sup.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,10 @@ start_protocol(SupPid, MonitorRef, Socket) ->
-spec active_connections(pid()) -> non_neg_integer().
active_connections(SupPid) ->
Tag = erlang:monitor(process, SupPid),
catch erlang:send(SupPid, {?MODULE, active_connections, self(), Tag},
[noconnect]),
try erlang:send(SupPid, {?MODULE, active_connections, self(), Tag}, [noconnect])
catch
_:_ -> ok
end,
receive
{Tag, Ret} ->
erlang:demonitor(Tag, [flush]),
Expand Down
12 changes: 6 additions & 6 deletions test/acceptor_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
-module(acceptor_SUITE).
-compile(export_all).
-compile(nowarn_export_all).
-compile(nowarn_deprecated_catch).

-dialyzer({nowarn_function, misc_wait_for_connections/1}).
%% @todo Remove when specs in ssl are updated to accept local addresses.
Expand Down Expand Up @@ -600,12 +601,11 @@ misc_connection_alarms(_) ->
AlarmCallback = fun (Ref, AlarmName, _, ActiveConns) ->
Self ! {connection_alarm, {Ref, AlarmName, length(ActiveConns)}}
end,
Alarms0 = #{
test1 => Alarm1 = #{type => num_connections, threshold => 2, cooldown => 0, callback => AlarmCallback},
%% The test2 alarm uses the misspelled treshold key to test for backwards compatibility.
%% @TODO: Change to use the proper spelling when treshold gets removed in Ranch 3.0.
test2 => Alarm2 = #{type => num_connections, treshold => 3, cooldown => 0, callback => AlarmCallback}
},
Alarm1 = #{type => num_connections, threshold => 2, cooldown => 0, callback => AlarmCallback},
%% The test2 alarm uses the misspelled treshold key to test for backwards compatibility.
%% @TODO: Change to use the proper spelling when treshold gets removed in Ranch 3.0.
Alarm2 = #{type => num_connections, treshold => 3, cooldown => 0, callback => AlarmCallback},
Alarms0 = #{test1 => Alarm1, test2 => Alarm2},
ConnectOpts = [binary, {active, false}, {packet, raw}],

{ok, _} = ranch:start_listener(Name, ranch_tcp,
Expand Down
Loading