Whitespace

This commit is contained in:
Rob Harrop 2011-01-20 09:37:57 +00:00
parent e36c0c8bf1
commit 928d5fde40
1 changed files with 13 additions and 8 deletions

View File

@ -236,8 +236,9 @@ cancel_subscription({error, _}, State) ->
"UNSUBSCRIBE must include a 'destination' or 'id' header\n",
State);
cancel_subscription({ok, ConsumerTag, Description}, State = #state{channel = MainChannel,
subscriptions = Subs}) ->
cancel_subscription({ok, ConsumerTag, Description},
State = #state{channel = MainChannel,
subscriptions = Subs}) ->
case dict:find(ConsumerTag, Subs) of
error ->
error("No subscription found",
@ -247,20 +248,24 @@ cancel_subscription({ok, ConsumerTag, Description}, State = #state{channel
State);
{ok, #subscription{channel = SubChannel}} ->
case amqp_channel:call(SubChannel,
#'basic.cancel'{consumer_tag = ConsumerTag}) of
#'basic.cancel'{
consumer_tag = ConsumerTag}) of
#'basic.cancel_ok'{consumer_tag = ConsumerTag} ->
ensure_subchannel_closed(SubChannel,
MainChannel,
State#state{subscriptions = dict:erase(ConsumerTag, Subs)});
NewSubs = dict:erase(ConsumerTag, Subs),
ensure_subchannel_closed(SubChannel,
MainChannel,
State#state{
subscriptions = NewSubs});
_ ->
error("Failed to cancel subscription",
"UNSUBSCRIBE to ~p failed.\n",
[Description],
[Description],
State)
end
end.
ensure_subchannel_closed(SubChannel, MainChannel, State) when SubChannel == MainChannel ->
ensure_subchannel_closed(SubChannel, MainChannel, State)
when SubChannel == MainChannel ->
ok(State);
ensure_subchannel_closed(SubChannel, _MainChannel, State) ->