From 88a73d73db0e06818b27ec4e6caeb2099be4e2e0 Mon Sep 17 00:00:00 2001 From: Ulf Wiger Date: Sun, 13 Dec 2015 11:59:25 -0800 Subject: More robust listeners, lots of bugfixes for (and in) test suite --- deps/exo/src/exo_socket_server.erl | 4 ++-- deps/exo/src/exo_socket_session.erl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'deps') 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 -> -- cgit v1.2.1