path: root/test/handlers/loop_handler_timeout_h.erl
diff options
authorLoïc Hoguin <[email protected]>2014-09-30 20:12:13 +0300
committerLoïc Hoguin <[email protected]>2014-09-30 20:12:13 +0300
commit0dc063ab7d94edb37c61f821b5d8e4c2da7f8ff1 (patch)
treeaaa71b552b0348fc403cc68ba8318e58f213d4fd /test/handlers/loop_handler_timeout_h.erl
parent5ce4c2bfb40ecc4b687a2941e612025a1c4ff913 (diff)
Improve handler interface and documentation
This change simplifies a little more the sub protocols mechanism. Aliases have been removed. The renaming of loop handlers as long polling handlers has been reverted. Plain HTTP handlers now simply do their work in the init/2 callback. There is no specific code for them. Loop handlers now follow the same return value as Websocket, they use ok to continue and shutdown to stop. Terminate reasons for all handler types have been documented. The terminate callback is now appropriately called in all cases (or should be). Behaviors for all handler types have been moved in the module that implement them. This means that cowboy_handler replaces the cowboy_http_handler behavior, and similarly cowboy_loop replaces cowboy_loop_handler, cowboy_websocket replaces cowboy_websocket_handler. Finally cowboy_rest now has the start of a behavior in it and will have the full list of optional callbacks defined once Erlang 18.0 gets released. The guide has been reorganized and should be easier to follow.
Diffstat (limited to 'test/handlers/loop_handler_timeout_h.erl')
1 files changed, 4 insertions, 4 deletions
diff --git a/test/handlers/loop_handler_timeout_h.erl b/test/handlers/loop_handler_timeout_h.erl
index 8e24d33..a1bfa51 100644
--- a/test/handlers/loop_handler_timeout_h.erl
+++ b/test/handlers/loop_handler_timeout_h.erl
@@ -1,7 +1,7 @@
%% This module implements a loop handler that sends
%% itself a timeout that will intentionally arrive
%% too late, as it configures itself to only wait
-%% 200ms before closing the connection in init/3.
+%% 200ms before closing the connection in init/2.
%% This results in a 204 reply being sent back by Cowboy.
@@ -12,10 +12,10 @@
init(Req, _) ->
erlang:send_after(1000, self(), timeout),
- {long_polling, Req, undefined, 200, hibernate}.
+ {cowboy_loop, Req, undefined, 200, hibernate}.
info(timeout, Req, State) ->
- {ok, cowboy_req:reply(500, Req), State}.
+ {shutdown, cowboy_req:reply(500, Req), State}.
-terminate({normal, timeout}, _, _) ->
+terminate(timeout, _, _) ->