diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-10-10 16:56:05 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-10-10 16:56:05 +0100 |
| commit | 56f2553dc3e21c7a5f4434f6632c3c9d7effe42c (patch) | |
| tree | 29586272cb782cf78abff3ec4c0d73b3160d2045 | |
| parent | 42d7a8154cbfe74c0e626fdc43499dfa0a4f570f (diff) | |
| download | rabbitmq-server-56f2553dc3e21c7a5f4434f6632c3c9d7effe42c.tar.gz | |
...and remove the old API.
| -rw-r--r-- | src/rabbit_heartbeat.erl | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/src/rabbit_heartbeat.erl b/src/rabbit_heartbeat.erl index eefab3bc..ca67254b 100644 --- a/src/rabbit_heartbeat.erl +++ b/src/rabbit_heartbeat.erl @@ -18,7 +18,7 @@ -export([start/6]). -export([start_heartbeat_sender/3, start_heartbeat_receiver/3, - start_heartbeat_fun/1, pause_monitor/1, resume_monitor/1]). + pause_monitor/1, resume_monitor/1]). -export([system_continue/3, system_terminate/4, system_code_change/4]). @@ -29,17 +29,11 @@ -ifdef(use_specs). -export_type([heartbeaters/0]). --export_type([start_heartbeat_fun/0]). -type(heartbeaters() :: {rabbit_types:maybe(pid()), rabbit_types:maybe(pid())}). -type(heartbeat_callback() :: fun (() -> any())). --type(start_heartbeat_fun() :: - fun((rabbit_net:socket(), non_neg_integer(), heartbeat_callback(), - non_neg_integer(), heartbeat_callback()) -> - no_return())). - -spec(start/6 :: (pid(), rabbit_net:socket(), non_neg_integer(), heartbeat_callback(), @@ -52,10 +46,6 @@ (rabbit_net:socket(), non_neg_integer(), heartbeat_callback()) -> rabbit_types:ok(pid())). --spec(start_heartbeat_fun/1 :: - (pid()) -> start_heartbeat_fun()). - - -spec(pause_monitor/1 :: (heartbeaters()) -> 'ok'). -spec(resume_monitor/1 :: (heartbeaters()) -> 'ok'). @@ -92,19 +82,6 @@ start_heartbeat_receiver(Sock, TimeoutSec, ReceiveFun) -> heartbeater({Sock, TimeoutSec * 1000, recv_oct, 1, fun () -> ReceiveFun(), stop end}). -start_heartbeat_fun(SupPid) -> - fun (Sock, SendTimeoutSec, SendFun, ReceiveTimeoutSec, ReceiveFun) -> - {ok, Sender} = - start_heartbeater(SendTimeoutSec, SupPid, Sock, - SendFun, heartbeat_sender, - start_heartbeat_sender), - {ok, Receiver} = - start_heartbeater(ReceiveTimeoutSec, SupPid, Sock, - ReceiveFun, heartbeat_receiver, - start_heartbeat_receiver), - {Sender, Receiver} - end. - pause_monitor({_Sender, none}) -> ok; pause_monitor({_Sender, Receiver}) -> Receiver ! pause, ok. |