diff options
| -rw-r--r-- | src/delegate.erl | 25 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 1 | ||||
| -rw-r--r-- | src/rabbit_router.erl | 7 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 11 |
4 files changed, 18 insertions, 26 deletions
diff --git a/src/delegate.erl b/src/delegate.erl index f3c3f097..5907eb09 100644 --- a/src/delegate.erl +++ b/src/delegate.erl @@ -94,10 +94,6 @@ call(Pid, FPid) when is_pid(Pid) -> call(Pids, FPid) when is_list(Pids) -> call_per_node(split_delegate_per_node(Pids), FPid). -internal_call(Node, Thunk) when is_atom(Node) -> - gen_server2:call({server(Node), Node}, {thunk, Thunk}, infinity). - - cast(Pid, FPid) when is_pid(Pid) -> cast_per_node([{node(Pid), [Pid]}], FPid), ok; @@ -106,20 +102,23 @@ cast(Pids, FPid) when is_list(Pids) -> cast_per_node(split_delegate_per_node(Pids), FPid), ok. +%%---------------------------------------------------------------------------- + +internal_call(Node, Thunk) when is_atom(Node) -> + gen_server2:call({server(Node), Node}, {thunk, Thunk}, infinity). + internal_cast(Node, Thunk) when is_atom(Node) -> gen_server2:cast({server(Node), Node}, {thunk, Thunk}). -%%---------------------------------------------------------------------------- - split_delegate_per_node(Pids) -> orddict:to_list( - lists:foldl( - fun (Pid, D) -> - orddict:update(node(Pid), - fun (Pids1) -> [Pid | Pids1] end, - [Pid], D) - end, - orddict:new(), Pids)). + lists:foldl( + fun (Pid, D) -> + orddict:update(node(Pid), + fun (Pids1) -> [Pid | Pids1] end, + [Pid], D) + end, + orddict:new(), Pids)). call_per_node([{Node, Pids}], FPid) when Node == node() -> local_delegate(Pids, FPid); diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 119808af..2c180846 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -219,7 +219,6 @@ rs(#resource{virtual_host = VHostPath, kind = Kind, name = Name}) -> lists:flatten(io_lib:format("~s '~s' in vhost '~s'", [Kind, Name, VHostPath])). - enable_cover() -> enable_cover("."). diff --git a/src/rabbit_router.erl b/src/rabbit_router.erl index 6a886eac..8681b535 100644 --- a/src/rabbit_router.erl +++ b/src/rabbit_router.erl @@ -57,14 +57,13 @@ deliver(QPids, Delivery = #delivery{mandatory = false, %% the QPids - the semantics is preserved. This scales much better %% than the non-immediate case below. delegate:cast(QPids, - fun(Pid) -> rabbit_amqqueue:deliver(Pid, Delivery) end), + fun(Pid) -> rabbit_amqqueue:deliver(Pid, Delivery) end), {routed, QPids}; deliver(QPids, Delivery) -> Res = delegate:call(QPids, - fun(Pid) -> rabbit_amqqueue:deliver(Pid, Delivery) end), - {Routed, Handled} = - lists:foldl(fun fold_deliveries/2, {false, []}, Res), + fun(Pid) -> rabbit_amqqueue:deliver(Pid, Delivery) end), + {Routed, Handled} = lists:foldl(fun fold_deliveries/2, {false, []}, Res), check_delivery(Delivery#delivery.mandatory, Delivery#delivery.immediate, {Routed, Handled}). diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 5ed7d64c..f7674d8b 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -859,11 +859,8 @@ test_delegates_async(SecondaryNode) -> make_responder(FMsg) -> fun() -> - receive - Msg -> - FMsg(Msg) - after 100 -> - throw(timeout) + receive Msg -> FMsg(Msg) + after 100 -> throw(timeout) end end. @@ -883,9 +880,7 @@ await_response(Count) -> end. test_delegates_sync(SecondaryNode) -> - Sender = fun(Pid) -> - gen_server2:call(Pid, invoked) - end, + Sender = fun(Pid) -> gen_server2:call(Pid, invoked) end, Responder = make_responder(fun({'$gen_call', From, invoked}) -> gen_server2:reply(From, response) |