Skip to content

Commit c151806

Browse files
committed
Apply PR formatting feedback
#13625 (comment) #13625 (comment)
1 parent ef1a595 commit c151806

File tree

3 files changed

+29
-30
lines changed

3 files changed

+29
-30
lines changed

deps/rabbit/src/rabbit_channel.erl

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,10 +1354,9 @@ handle_method(#'basic.consume'{queue = QueueNameBin,
13541354
CurrentConsumers = maps:size(ConsumerMapping),
13551355
case maps:find(ConsumerTag, ConsumerMapping) of
13561356
error when CurrentConsumers >= MaxConsumers -> % false when MaxConsumers is 'infinity'
1357-
rabbit_misc:protocol_error(
1358-
not_allowed,
1359-
"reached maximum (~B) of consumers per channel",
1360-
[MaxConsumers]);
1357+
rabbit_misc:protocol_error(not_allowed,
1358+
"reached maximum (~B) of consumers per channel",
1359+
[MaxConsumers]);
13611360
error ->
13621361
QueueName = qbin_to_resource(QueueNameBin, VHostPath),
13631362
check_read_permitted(QueueName, User, AuthzContext),
@@ -1368,13 +1367,13 @@ handle_method(#'basic.consume'{queue = QueueNameBin,
13681367
_ ->
13691368
ConsumerTag
13701369
end,
1371-
basic_consume(
1372-
QueueName, NoAck, ConsumerPrefetch, ActualTag,
1373-
ExclusiveConsume, Args, NoWait, State);
1370+
basic_consume(QueueName, NoAck, ConsumerPrefetch, ActualTag,
1371+
ExclusiveConsume, Args, NoWait, State);
13741372
{ok, _} ->
13751373
%% Attempted reuse of consumer tag.
1376-
rabbit_misc:protocol_error(
1377-
not_allowed, "attempt to reuse consumer tag '~ts'", [ConsumerTag])
1374+
rabbit_misc:protocol_error(not_allowed,
1375+
"attempt to reuse consumer tag '~ts'",
1376+
[ConsumerTag])
13781377
end;
13791378

13801379
handle_method(#'basic.cancel'{consumer_tag = ConsumerTag, nowait = NoWait},

deps/rabbit/src/rabbit_queue_type.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ consume(Q, Spec, State) ->
522522
case Mod:consume(Q, Spec, CtxState0) of
523523
{ok, CtxState} ->
524524
{ok, set_ctx(Q, Ctx#ctx{state = CtxState}, State)};
525-
Err = {error, _Type, _Fmt, _FmtArgs} ->
525+
{error, _Type, _Fmt, _FmtArgs} = Err->
526526
Err
527527
end.
528528

deps/rabbit/src/rabbit_quorum_queue.erl

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,8 +1010,7 @@ consume(Q, Spec, QState0) when ?amqqueue_is_quorum(Q) ->
10101010
args => Args,
10111011
username => ActingUser,
10121012
priority => Priority},
1013-
case rabbit_fifo_client:checkout(
1014-
ConsumerTag, Mode, ConsumerMeta, QState0) of
1013+
case rabbit_fifo_client:checkout(ConsumerTag, Mode, ConsumerMeta, QState0) of
10151014
{ok, _Infos, QState} ->
10161015
case single_active_consumer_on(Q) of
10171016
true ->
@@ -1024,29 +1023,30 @@ consume(Q, Spec, QState0) when ?amqqueue_is_quorum(Q) ->
10241023
_ ->
10251024
waiting
10261025
end,
1027-
rabbit_core_metrics:consumer_created(
1028-
ChPid, ConsumerTag, ExclusiveConsume,
1029-
AckRequired, QName,
1030-
Prefetch, ActivityStatus == single_active, %% Active
1031-
ActivityStatus, Args),
1032-
emit_consumer_created(
1033-
ChPid, ConsumerTag, ExclusiveConsume,
1034-
AckRequired, QName, Prefetch,
1035-
Args, none, ActingUser),
1026+
rabbit_core_metrics:consumer_created(ChPid, ConsumerTag,
1027+
ExclusiveConsume,
1028+
AckRequired, QName,
1029+
Prefetch,
1030+
ActivityStatus == single_active,
1031+
ActivityStatus, Args),
1032+
emit_consumer_created(ChPid, ConsumerTag,
1033+
ExclusiveConsume,
1034+
AckRequired, QName,
1035+
Prefetch, Args, none,
1036+
ActingUser),
10361037
{ok, QState};
10371038
Err ->
10381039
consume_error(Err, QName)
10391040
end;
10401041
false ->
1041-
rabbit_core_metrics:consumer_created(
1042-
ChPid, ConsumerTag, ExclusiveConsume,
1043-
AckRequired, QName,
1044-
Prefetch, true, %% Active
1045-
up, Args),
1046-
emit_consumer_created(
1047-
ChPid, ConsumerTag, ExclusiveConsume,
1048-
AckRequired, QName, Prefetch,
1049-
Args, none, ActingUser),
1042+
rabbit_core_metrics:consumer_created(ChPid, ConsumerTag,
1043+
ExclusiveConsume,
1044+
AckRequired, QName,
1045+
Prefetch, true,
1046+
up, Args),
1047+
emit_consumer_created(ChPid, ConsumerTag, ExclusiveConsume,
1048+
AckRequired, QName, Prefetch,
1049+
Args, none, ActingUser),
10501050
{ok, QState}
10511051
end;
10521052
Err ->

0 commit comments

Comments
 (0)