umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-16 13:10:24 +00:00
Code Issues Wiki Activity

Check for upgrades on accept timeout

Browse source 
Otherwise acceptors will not be upgraded properly until after the
next request comes in.

Thanks to DeadZen for pointing it out.
This commit is contained in:
Loïc Hoguin 2012-02-20 09:31:22 +01:00
parent 811d11a1a2
commit db382d4d39
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cowboy_acceptor.erl
View file

@ -41,7 +41,7 @@ acceptor(LSocket, Transport, Protocol, Opts, OptsVsn, ListenerPid, ReqsSup) ->
cowboy_listener:add_connection(ListenerPid, cowboy_listener:add_connection(ListenerPid,
default, Pid, OptsVsn); default, Pid, OptsVsn);
{error, timeout} -> {error, timeout} ->
ok; cowboy_listener:check_upgrades(ListenerPid, OptsVsn);
{error, _Reason} -> {error, _Reason} ->
%% @todo Probably do something here. If the socket was closed, %% @todo Probably do something here. If the socket was closed,
%% we may want to try and listen again on the port? %% we may want to try and listen again on the port?

15
src/cowboy_listener.erl
View file

@ -17,7 +17,7 @@
-behaviour(gen_server). -behaviour(gen_server).
-export([start_link/2, stop/1, -export([start_link/2, stop/1,
add_connection/4, move_connection/3, remove_connection/2, add_connection/4, move_connection/3, remove_connection/2, check_upgrades/2,
get_protocol_options/1, set_protocol_options/2]). %% API. get_protocol_options/1, set_protocol_options/2]). %% API.
-export([init/1, handle_call/3, handle_cast/2, -export([init/1, handle_call/3, handle_cast/2,
handle_info/2, terminate/2, code_change/3]). %% gen_server. handle_info/2, terminate/2, code_change/3]). %% gen_server.
@ -84,6 +84,12 @@ move_connection(ServerPid, DestPool, ConnPid) ->
remove_connection(ServerPid, ConnPid) -> remove_connection(ServerPid, ConnPid) ->
gen_server:cast(ServerPid, {remove_connection, ConnPid}). gen_server:cast(ServerPid, {remove_connection, ConnPid}).
%% @doc Return whether a protocol upgrade is required.
-spec check_upgrades(pid(), non_neg_integer())
-> ok | {upgrade, any(), non_neg_integer()}.
check_upgrades(ServerPid, OptsVsn) ->
gen_server:call(ServerPid, {check_upgrades, OptsVsn}).
%% @doc Return the current protocol options. %% @doc Return the current protocol options.
-spec get_protocol_options(pid()) -> {ok, any()}. -spec get_protocol_options(pid()) -> {ok, any()}.
get_protocol_options(ServerPid) -> get_protocol_options(ServerPid) ->
@ -121,6 +127,13 @@ handle_call({add_connection, Pool, ConnPid, AccOptsVsn}, From, State=#state{
true -> true ->
{reply, ok, State2} {reply, ok, State2}
end; end;
handle_call({check_upgrades, AccOptsVsn}, _From, State=#state{
proto_opts=ProtoOpts, proto_opts_vsn=LisOptsVsn}) ->
if AccOptsVsn =/= LisOptsVsn ->
{reply, {upgrade, ProtoOpts, LisOptsVsn}, State};
true ->
{reply, ok, State}
end;
handle_call(get_protocol_options, _From, State=#state{proto_opts=ProtoOpts}) -> handle_call(get_protocol_options, _From, State=#state{proto_opts=ProtoOpts}) ->
{reply, {ok, ProtoOpts}, State}; {reply, {ok, ProtoOpts}, State};
handle_call({set_protocol_options, ProtoOpts}, _From, handle_call({set_protocol_options, ProtoOpts}, _From,