diff options
| author | Ulf Wiger <ulf@feuerlabs.com> | 2015-12-13 11:59:25 -0800 |
|---|---|---|
| committer | Ulf Wiger <ulf@feuerlabs.com> | 2015-12-13 11:59:25 -0800 |
| commit | 88a73d73db0e06818b27ec4e6caeb2099be4e2e0 (patch) | |
| tree | 206434dc830eb15bbf3d1687e149293237b8a768 /deps | |
| parent | 2572d8c0c0ea55b55f4225005bcf706084bd456d (diff) | |
| download | rvi_core-88a73d73db0e06818b27ec4e6caeb2099be4e2e0.tar.gz | |
More robust listeners, lots of bugfixes for (and in) test suite
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/exo/src/exo_socket_server.erl | 4 | ||||
| -rw-r--r-- | deps/exo/src/exo_socket_session.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/deps/exo/src/exo_socket_server.erl b/deps/exo/src/exo_socket_server.erl index db67c5a..d134a45 100644 --- a/deps/exo/src/exo_socket_server.erl +++ b/deps/exo/src/exo_socket_server.erl @@ -280,9 +280,9 @@ handle_info({inet_async, LSocket, Ref, {ok,Socket}} = _Msg, State) when NewAccept = exo_socket:async_accept(Listen), case exo_socket:async_socket(Listen, Socket, [{delay_auth, true}]) of {ok, XSocket} -> - F = fun() -> + F = fun(X) -> exo_socket:accept( - XSocket, tl(XSocket#exo_socket.protocol), AcceptTimeout) + X, tl(X#exo_socket.protocol), AcceptTimeout) end, XSocketFun = {XSocket, F}, case exo_socket_session:start(XSocketFun, diff --git a/deps/exo/src/exo_socket_session.erl b/deps/exo/src/exo_socket_session.erl index f4518db..189be61 100644 --- a/deps/exo/src/exo_socket_session.erl +++ b/deps/exo/src/exo_socket_session.erl @@ -176,8 +176,8 @@ send_(Bin, From, #state{socket = S, pending = P} = State) -> handle_cast({activate,Active}, #state{socket = XSocket0} = State0) -> ?dbg("activate~n", []), case XSocket0 of - {#exo_socket{}, Fun} when is_function(Fun, 0) -> - try Fun() of + {#exo_socket{} = X, Fun} when is_function(Fun, 1) -> + try Fun(X) of {ok, XSocket} -> activate_(Active, State0#state{socket = XSocket}); {error, _} = Error -> |