From d1b65a67cf093160c383071ef1bb40b0fc096d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Fri, 12 Aug 2016 19:27:23 +0200 Subject: 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. --- test/ws_SUITE_data/ws_timeout_cancel.erl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'test/ws_SUITE_data/ws_timeout_cancel.erl') 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}. -- cgit v1.2.3