mirror of
https://github.com/ninenines/cowboy.git
synced 2025-07-16 05:00:24 +00:00
Replace terminate/2 with terminate/3, adding a Reason
This should have been done a *long* time ago, back when I initially
added Websocket support. This is the first part of two in improving
loop handler support with regards to socket closure.
Reason may include: {normal, shutdown} for the most normal shutdown,
{normal, timeout} for a loop handler timeout shutdown, or {error, _}
if an error occured.
This commit is contained in:
Loïc Hoguin
parent
297ae32af1
commit
647e95aed1
27 changed files with 76 additions and 99 deletions
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
-module(chunked_handler).
|
||||
-behaviour(cowboy_http_handler).
|
||||
-export([init/3, handle/2, terminate/2]).
|
||||
-export([init/3, handle/2, terminate/3]).
|
||||
|
||||
init({_Transport, http}, Req, _Opts) ->
|
||||
{ok, Req, undefined}.
|
||||
|
|
@ -13,5 +13,5 @@ handle(Req, State) ->
|
|||
cowboy_req:chunk("works fine!", Req2),
|
||||
{ok, Req2, State}.
|
||||
|
||||
terminate(_Req, _State) ->
|
||||
terminate(_, _, _) ->
|
||||
ok.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
-module(http_handler).
|
||||
-behaviour(cowboy_http_handler).
|
||||
-export([init/3, handle/2, terminate/2]).
|
||||
-export([init/3, handle/2, terminate/3]).
|
||||
|
||||
-record(state, {headers, body}).
|
||||
|
||||
|
|
@ -15,5 +15,5 @@ handle(Req, State=#state{headers=Headers, body=Body}) ->
|
|||
{ok, Req2} = cowboy_req:reply(200, Headers, Body, Req),
|
||||
{ok, Req2, State}.
|
||||
|
||||
terminate(_Req, _State) ->
|
||||
terminate(_, _, _) ->
|
||||
ok.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
-module(http_handler_echo_body).
|
||||
-behaviour(cowboy_http_handler).
|
||||
-export([init/3, handle/2, terminate/2]).
|
||||
-export([init/3, handle/2, terminate/3]).
|
||||
|
||||
init({_, http}, Req, _) ->
|
||||
{ok, Req, undefined}.
|
||||
|
|
@ -15,5 +15,5 @@ handle(Req, State) ->
|
|||
{ok, Req4} = cowboy_req:reply(200, [], Body, Req3),
|
||||
{ok, Req4, State}.
|
||||
|
||||
terminate(_, _) ->
|
||||
terminate(_, _, _) ->
|
||||
ok.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
-module(http_handler_errors).
|
||||
-behaviour(cowboy_http_handler).
|
||||
-export([init/3, handle/2, terminate/2]).
|
||||
-export([init/3, handle/2, terminate/3]).
|
||||
|
||||
init({_Transport, http}, Req, _Opts) ->
|
||||
{Case, Req1} = cowboy_req:qs_val(<<"case">>, Req),
|
||||
|
|
@ -36,5 +36,5 @@ handle(Req, <<"handle_after_reply">> = Case) ->
|
|||
{ok, _Req1} = cowboy_req:reply(200, [], "http_handler_crashes", Req),
|
||||
erlang:error(Case).
|
||||
|
||||
terminate(_Req, _State) ->
|
||||
terminate(_, _, _) ->
|
||||
ok.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
-module(http_handler_init_shutdown).
|
||||
-behaviour(cowboy_http_handler).
|
||||
-export([init/3, handle/2, terminate/2]).
|
||||
-export([init/3, handle/2, terminate/3]).
|
||||
|
||||
init({_Transport, http}, Req, _Opts) ->
|
||||
{ok, Req2} = cowboy_req:reply(<<"666 Init Shutdown Testing">>,
|
||||
|
|
@ -13,5 +13,5 @@ handle(Req, State) ->
|
|||
{ok, Req2} = cowboy_req:reply(200, [], "Hello world!", Req),
|
||||
{ok, Req2, State}.
|
||||
|
||||
terminate(_Req, _State) ->
|
||||
terminate(_, _, _) ->
|
||||
ok.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
-module(http_handler_long_polling).
|
||||
-behaviour(cowboy_http_handler).
|
||||
-export([init/3, handle/2, info/3, terminate/2]).
|
||||
-export([init/3, handle/2, info/3, terminate/3]).
|
||||
|
||||
init({_Transport, http}, Req, _Opts) ->
|
||||
erlang:send_after(500, self(), timeout),
|
||||
|
|
@ -18,5 +18,5 @@ info(timeout, Req, State) ->
|
|||
erlang:send_after(500, self(), timeout),
|
||||
{loop, Req, State - 1, hibernate}.
|
||||
|
||||
terminate(_Req, _State) ->
|
||||
terminate({normal, shutdown}, _, _) ->
|
||||
ok.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
-module(http_handler_loop_timeout).
|
||||
-behaviour(cowboy_loop_handler).
|
||||
-export([init/3, info/3, terminate/2]).
|
||||
-export([init/3, info/3, terminate/3]).
|
||||
|
||||
init({_, http}, Req, _) ->
|
||||
erlang:send_after(1000, self(), error_timeout),
|
||||
|
|
@ -12,5 +12,5 @@ info(error_timeout, Req, State) ->
|
|||
{ok, Req2} = cowboy_req:reply(500, Req),
|
||||
{ok, Req2, State}.
|
||||
|
||||
terminate(_, _) ->
|
||||
terminate({normal, timeout}, _, _) ->
|
||||
ok.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
-module(http_handler_multipart).
|
||||
-behaviour(cowboy_http_handler).
|
||||
-export([init/3, handle/2, terminate/2]).
|
||||
-export([init/3, handle/2, terminate/3]).
|
||||
|
||||
init({_Transport, http}, Req, []) ->
|
||||
{ok, Req, {}}.
|
||||
|
|
@ -12,7 +12,7 @@ handle(Req, State) ->
|
|||
{ok, Req3} = cowboy_req:reply(200, [], term_to_binary(Result), Req2),
|
||||
{ok, Req3, State}.
|
||||
|
||||
terminate(_Req, _State) ->
|
||||
terminate(_, _, _) ->
|
||||
ok.
|
||||
|
||||
acc_multipart(Req) ->
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
-module(http_handler_set_resp).
|
||||
-behaviour(cowboy_http_handler).
|
||||
-export([init/3, handle/2, terminate/2]).
|
||||
-export([init/3, handle/2, terminate/3]).
|
||||
|
||||
init({_Transport, http}, Req, Opts) ->
|
||||
Headers = proplists:get_value(headers, Opts, []),
|
||||
|
|
@ -27,5 +27,5 @@ handle(Req, State) ->
|
|||
end
|
||||
end.
|
||||
|
||||
terminate(_Req, _State) ->
|
||||
terminate(_, _, _) ->
|
||||
ok.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
-module(http_handler_stream_body).
|
||||
-behaviour(cowboy_http_handler).
|
||||
-export([init/3, handle/2, terminate/2]).
|
||||
-export([init/3, handle/2, terminate/3]).
|
||||
|
||||
-record(state, {headers, body, reply}).
|
||||
|
||||
|
|
@ -24,5 +24,5 @@ handle(Req, State=#state{headers=_Headers, body=Body, reply=Reply}) ->
|
|||
{ok, Req3} = cowboy_req:reply(200, Req2),
|
||||
{ok, Req3, State}.
|
||||
|
||||
terminate(_Req, _State) ->
|
||||
terminate(_, _, _) ->
|
||||
ok.
|
||||
|
|
|
|||
|
|
@ -1,21 +1,14 @@
|
|||
%% Feel free to use, reuse and abuse the code in this file.
|
||||
|
||||
-module(websocket_echo_handler).
|
||||
-behaviour(cowboy_http_handler).
|
||||
-behaviour(cowboy_websocket_handler).
|
||||
-export([init/3, handle/2, terminate/2]).
|
||||
-export([init/3]).
|
||||
-export([websocket_init/3, websocket_handle/3,
|
||||
websocket_info/3, websocket_terminate/3]).
|
||||
|
||||
init(_Any, _Req, _Opts) ->
|
||||
{upgrade, protocol, cowboy_websocket}.
|
||||
|
||||
handle(_Req, _State) ->
|
||||
exit(badarg).
|
||||
|
||||
terminate(_Req, _State) ->
|
||||
exit(badarg).
|
||||
|
||||
websocket_init(_TransportName, Req, _Opts) ->
|
||||
Req2 = cowboy_req:compact(Req),
|
||||
{ok, Req2, undefined}.
|
||||
|
|
|
|||
|
|
@ -1,21 +1,14 @@
|
|||
%% Feel free to use, reuse and abuse the code in this file.
|
||||
|
||||
-module(websocket_handler).
|
||||
-behaviour(cowboy_http_handler).
|
||||
-behaviour(cowboy_websocket_handler).
|
||||
-export([init/3, handle/2, terminate/2]).
|
||||
-export([init/3]).
|
||||
-export([websocket_init/3, websocket_handle/3,
|
||||
websocket_info/3, websocket_terminate/3]).
|
||||
|
||||
init(_Any, _Req, _Opts) ->
|
||||
{upgrade, protocol, cowboy_websocket}.
|
||||
|
||||
handle(_Req, _State) ->
|
||||
exit(badarg).
|
||||
|
||||
terminate(_Req, _State) ->
|
||||
exit(badarg).
|
||||
|
||||
websocket_init(_TransportName, Req, _Opts) ->
|
||||
erlang:start_timer(1000, self(), <<"websocket_init">>),
|
||||
Req2 = cowboy_req:compact(Req),
|
||||
|
|
|
|||
|
|
@ -1,21 +1,14 @@
|
|||
%% Feel free to use, reuse and abuse the code in this file.
|
||||
|
||||
-module(websocket_handler_init_shutdown).
|
||||
-behaviour(cowboy_http_handler).
|
||||
-behaviour(cowboy_websocket_handler).
|
||||
-export([init/3, handle/2, terminate/2]).
|
||||
-export([init/3]).
|
||||
-export([websocket_init/3, websocket_handle/3,
|
||||
websocket_info/3, websocket_terminate/3]).
|
||||
|
||||
init(_Any, _Req, _Opts) ->
|
||||
{upgrade, protocol, cowboy_websocket}.
|
||||
|
||||
handle(_Req, _State) ->
|
||||
exit(badarg).
|
||||
|
||||
terminate(_Req, _State) ->
|
||||
exit(badarg).
|
||||
|
||||
websocket_init(_TransportName, Req, _Opts) ->
|
||||
{ok, Req2} = cowboy_req:reply(403, Req),
|
||||
{shutdown, Req2}.
|
||||
|
|
|
|||
|
|
@ -1,21 +1,14 @@
|
|||
%% Feel free to use, reuse and abuse the code in this file.
|
||||
|
||||
-module(ws_timeout_cancel_handler).
|
||||
-behaviour(cowboy_http_handler).
|
||||
-behaviour(cowboy_websocket_handler).
|
||||
-export([init/3, handle/2, terminate/2]).
|
||||
-export([init/3]).
|
||||
-export([websocket_init/3, websocket_handle/3,
|
||||
websocket_info/3, websocket_terminate/3]).
|
||||
|
||||
init(_Any, _Req, _Opts) ->
|
||||
{upgrade, protocol, cowboy_websocket}.
|
||||
|
||||
handle(_Req, _State) ->
|
||||
exit(badarg).
|
||||
|
||||
terminate(_Req, _State) ->
|
||||
exit(badarg).
|
||||
|
||||
websocket_init(_TransportName, Req, _Opts) ->
|
||||
erlang:start_timer(500, self(), should_not_cancel_timer),
|
||||
{ok, Req, undefined, 1000}.
|
||||
|
|
|
|||
|
|
@ -1,21 +1,14 @@
|
|||
%% Feel free to use, reuse and abuse the code in this file.
|
||||
|
||||
-module(ws_timeout_hibernate_handler).
|
||||
-behaviour(cowboy_http_handler).
|
||||
-behaviour(cowboy_websocket_handler).
|
||||
-export([init/3, handle/2, terminate/2]).
|
||||
-export([init/3]).
|
||||
-export([websocket_init/3, websocket_handle/3,
|
||||
websocket_info/3, websocket_terminate/3]).
|
||||
|
||||
init(_Any, _Req, _Opts) ->
|
||||
{upgrade, protocol, cowboy_websocket}.
|
||||
|
||||
handle(_Req, _State) ->
|
||||
exit(badarg).
|
||||
|
||||
terminate(_Req, _State) ->
|
||||
exit(badarg).
|
||||
|
||||
websocket_init(_TransportName, Req, _Opts) ->
|
||||
{ok, Req, undefined, 1000, hibernate}.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue