aboutsummaryrefslogtreecommitdiffstats
path: root/test/ws_SUITE_data/ws_timeout_cancel.erl
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2016-08-12 19:27:23 +0200
committerLoïc Hoguin <[email protected]>2016-08-12 19:27:23 +0200
commitd1b65a67cf093160c383071ef1bb40b0fc096d88 (patch)
tree9f1d78532e8043ff229c52387e48c34a010c8f46 /test/ws_SUITE_data/ws_timeout_cancel.erl
parentb63b6ef86556bbfad3ec2742713fc84d1a8a6943 (diff)
downloadcowboy-d1b65a67cf093160c383071ef1bb40b0fc096d88.tar.gz
cowboy-d1b65a67cf093160c383071ef1bb40b0fc096d88.tar.bz2
cowboy-d1b65a67cf093160c383071ef1bb40b0fc096d88.zip
Remove Req from the Websocket interface
After the switch to Websocket, we are no longer in a request/response scenario, therefore a lot of the cowboy_req functions do not apply anymore. Any data required from the request will need to be taken from Req in init/2 and saved in the handler's state.
Diffstat (limited to 'test/ws_SUITE_data/ws_timeout_cancel.erl')
-rw-r--r--test/ws_SUITE_data/ws_timeout_cancel.erl16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/ws_SUITE_data/ws_timeout_cancel.erl b/test/ws_SUITE_data/ws_timeout_cancel.erl
index 7376140..8883d2f 100644
--- a/test/ws_SUITE_data/ws_timeout_cancel.erl
+++ b/test/ws_SUITE_data/ws_timeout_cancel.erl
@@ -3,18 +3,18 @@
-module(ws_timeout_cancel).
-export([init/2]).
--export([websocket_handle/3]).
--export([websocket_info/3]).
+-export([websocket_handle/2]).
+-export([websocket_info/2]).
init(Req, _) ->
erlang:start_timer(500, self(), should_not_cancel_timer),
{cowboy_websocket, Req, undefined, 1000}.
-websocket_handle({text, Data}, Req, State) ->
- {reply, {text, Data}, Req, State};
-websocket_handle({binary, Data}, Req, State) ->
- {reply, {binary, Data}, Req, State}.
+websocket_handle({text, Data}, State) ->
+ {reply, {text, Data}, State};
+websocket_handle({binary, Data}, State) ->
+ {reply, {binary, Data}, State}.
-websocket_info(_Info, Req, State) ->
+websocket_info(_Info, State) ->
erlang:start_timer(500, self(), should_not_cancel_timer),
- {ok, Req, State}.
+ {ok, State}.