diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-08-13 10:43:52 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-08-13 10:43:52 +0100 |
| commit | b19d9cb743fe4e0cda9d62bf0d62d1aca5da578b (patch) | |
| tree | a7b6f2f75311c19cc9863def2dfb74fc6de30e76 | |
| parent | 47f5b3df329ca7b75e0e090e9bd09338fe716b4d (diff) | |
| parent | 12ac8d3b9aff2568da6dff0595418dc23cf88210 (diff) | |
| download | rabbitmq-server-b19d9cb743fe4e0cda9d62bf0d62d1aca5da578b.tar.gz | |
merge bug23120 into default
| -rw-r--r-- | src/rabbit_heartbeat.erl | 9 | ||||
| -rw-r--r-- | src/rabbit_networking.erl | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_heartbeat.erl b/src/rabbit_heartbeat.erl index faddffc1..7c10d48a 100644 --- a/src/rabbit_heartbeat.erl +++ b/src/rabbit_heartbeat.erl @@ -37,11 +37,12 @@ -ifdef(use_specs). --type(pids() :: rabbit_types:maybe({pid(), pid()})). +-type(heartbeaters() :: rabbit_types:maybe({pid(), pid()})). --spec(start_heartbeat/2 :: (rabbit_net:socket(), non_neg_integer()) -> pids()). --spec(pause_monitor/1 :: (pids()) -> 'ok'). --spec(resume_monitor/1 :: (pids()) -> 'ok'). +-spec(start_heartbeat/2 :: (rabbit_net:socket(), non_neg_integer()) -> + heartbeaters()). +-spec(pause_monitor/1 :: (heartbeaters()) -> 'ok'). +-spec(resume_monitor/1 :: (heartbeaters()) -> 'ok'). -endif. diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index 3a3357ba..f968b0d8 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -242,8 +242,7 @@ connection_info_all() -> cmap(fun (Q) -> connection_info(Q) end). connection_info_all(Items) -> cmap(fun (Q) -> connection_info(Q, Items) end). close_connection(Pid, Explanation) -> - case lists:any(fun ({_, ChildPid, _, _}) -> ChildPid =:= Pid end, - supervisor:which_children(rabbit_tcp_client_sup)) of + case lists:member(Pid, connections()) of true -> rabbit_reader:shutdown(Pid, Explanation); false -> throw({error, {not_a_connection_pid, Pid}}) end. |