diff options
| author | Loïc Hoguin <[email protected]> | 2013-08-31 18:23:53 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2013-08-31 18:23:53 +0200 |
| commit | 38a19704a4e0ffb7103384a8b3decb2d75a4e978 (patch) | |
| tree | 7d4dc9931b630d151e91885dc94830b9364ca261 | |
| parent | d8d9014c4beb7d58905bd5e05ff92c6a4a7bbc13 (diff) | |
| download | gun-38a19704a4e0ffb7103384a8b3decb2d75a4e978.tar.gz gun-38a19704a4e0ffb7103384a8b3decb2d75a4e978.tar.bz2 gun-38a19704a4e0ffb7103384a8b3decb2d75a4e978.zip | |
Actually handle system messages instead of just dying
| -rw-r--r-- | src/gun.erl | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/gun.erl b/src/gun.erl index 3b614d2..b1421af 100644 --- a/src/gun.erl +++ b/src/gun.erl @@ -52,6 +52,9 @@ %% Internals. -export([start_link/4]). -export([init/5]). +-export([system_continue/3]). +-export([system_terminate/4]). +-export([system_code_change/4]). -type conn_type() :: ssl | tcp | tcp_spdy. -type headers() :: [{iodata(), iodata()}]. @@ -296,7 +299,7 @@ retry_loop(State=#state{parent=Parent, retry_timeout=RetryTimeout}, Retries) -> connect(State, Retries); {system, From, Request} -> sys:handle_system_msg(Request, From, Parent, ?MODULE, [], - {retry_loop, [State, Retries]}) + {retry_loop, State, Retries}) end. before_loop(State=#state{keepalive=Keepalive}) -> @@ -354,7 +357,7 @@ loop(State=#state{parent=Parent, owner=Owner, host=Host, ok; {system, From, Request} -> sys:handle_system_msg(Request, From, Parent, ?MODULE, [], - {loop, [State]}); + {loop, State}); Any when is_tuple(Any), is_pid(element(2, Any)) -> element(2, Any) ! {gun_error, self(), {notowner, "Operations are restricted to the owner of the connection."}}, @@ -398,7 +401,7 @@ ws_loop(State=#state{parent=Parent, owner=Owner, retry=Retry, socket=Socket, ok; {system, From, Request} -> sys:handle_system_msg(Request, From, Parent, ?MODULE, [], - {loop, [State]}); + {ws_loop, State}); Any when is_tuple(Any), is_pid(element(2, Any)) -> element(2, Any) ! {gun_error, self(), {notowner, "Operations are restricted to the owner of the connection."}}, @@ -406,3 +409,17 @@ ws_loop(State=#state{parent=Parent, owner=Owner, retry=Retry, socket=Socket, Any -> error_logger:error_msg("Unexpected message: ~w~n", [Any]) end. + +system_continue(_, _, {retry_loop, State, Retry}) -> + retry_loop(State, Retry); +system_continue(_, _, {loop, State}) -> + loop(State); +system_continue(_, _, {ws_loop, State}) -> + ws_loop(State). + +-spec system_terminate(any(), _, _, _) -> no_return(). +system_terminate(Reason, _, _, _) -> + exit(Reason). + +system_code_change(Misc, _, _, _) -> + {ok, Misc}. |