Skip to content

Commit 9ef9d62

Browse files
authored
Merge pull request #6 from fenollp/wrn011
fix 0.1.1 warnings
2 parents 9538f6e + 946b4e6 commit 9ef9d62

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

rebar.config

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
{erl_opts, [debug_info]}.
1+
{erl_opts, [debug_info
2+
,{platform_define, "^2[1-9]", post20}
3+
]}.
24

35
{xref_checks, [undefined_function_calls,locals_not_used]}.
46

src/elli_ws_protocol.erl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -329,12 +329,12 @@ websocket_data(State, Req, HandlerState, Data) ->
329329
handler_before_loop(State, Req, HandlerState, Data).
330330

331331
%% Initialize or update fragmentation state.
332-
%% -spec websocket_data(#state{}, Req, any(),
333-
%% opcode(), non_neg_integer(), mask_key(), binary(), rsv(), 0 | 1)
334-
%% -> {ok, Req, cowboy_middleware:env()}
335-
%% | {suspend, module(), atom(), [any()]}
336-
%% when Req::elli_ws_request_adapter:req().
337332
%% The opcode is only included in the first frame fragment.
333+
-spec websocket_data(#state{}, Req, any(),
334+
opcode(), non_neg_integer(), mask_key(), binary(), rsv(), 0 | 1)
335+
-> {ok, Req, cowboy_middleware:env()}
336+
| {suspend, module(), atom(), [any()]}
337+
when Req::elli_ws_request_adapter:req().
338338
websocket_data(State=#state{frag_state=undefined}, Req, HandlerState,
339339
Opcode, Len, MaskKey, Data, Rsv, 0) ->
340340
websocket_payload(State#state{frag_state={nofin, Opcode, <<>>}},

src/elli_ws_request_adapter.erl

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@
6666

6767
-type req() :: #req_adapter{}.
6868

69+
-ifdef(post20).
70+
-define(EXCEPTION(Class, Reason, Stacktrace), Class:Reason:Stacktrace).
71+
-define(GET_STACK(Stacktrace), Stacktrace).
72+
-else.
73+
-define(EXCEPTION(Class, Reason, _), Class:Reason).
74+
-define(GET_STACK(_), erlang:get_stacktrace()).
75+
-endif.
6976

7077
%%
7178
%%
@@ -233,10 +240,9 @@ websocket_handler_handle_event(#req_adapter{req=Req}, Handler, Name, EventArgs,
233240
try
234241
Handler:websocket_handle_event(Name, [Req|EventArgs], HandlerOpts)
235242
catch
236-
EvClass:EvError ->
243+
?EXCEPTION(EvClass, EvError, ST) ->
237244
error_logger:error_msg("~p:handle_event/3 crashed ~p:~p~n~p",
238-
[Handler, EvClass, EvError,
239-
erlang:get_stacktrace()])
245+
[Handler, EvClass, EvError, ?GET_STACK(ST)])
240246
end.
241247

242248
%% @doc Atoms used to identify messages in {active, once | true} mode.

0 commit comments

Comments
 (0)