Skip to content

Commit 45385e1

Browse files
LoisSotoLopezLoisSotoLopez
authored
Merge branch 'rabbitmq:main' into message-interceptors
2 parents a86d639 + 2a93bbc commit 45385e1

File tree

54 files changed

+638
-391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+638
-391
lines changed

‎deps/rabbit/scripts/rabbitmq-diagnostics.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ REM Note: do NOT add -noinput because "observer" depends on it
5050
-kernel inet_dist_listen_min !RABBITMQ_CTL_DIST_PORT_MIN! ^
5151
-kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
5252
-run escript start ^
53-
-escript main rabbitmqctl_escript ^
53+
-escript main Elixir.RabbitMQCtl ^
5454
-extra "%RABBITMQ_HOME%\escript\rabbitmq-diagnostics" !STAR!
5555

5656
if ERRORLEVEL 1 (

‎deps/rabbit/scripts/rabbitmq-plugins.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if not defined ERL_CRASH_DUMP_SECONDS (
4343
-kernel inet_dist_listen_min !RABBITMQ_CTL_DIST_PORT_MIN! ^
4444
-kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
4545
-run escript start ^
46-
-escript main rabbitmqctl_escript ^
46+
-escript main Elixir.RabbitMQCtl ^
4747
-extra "%RABBITMQ_HOME%\escript\rabbitmq-plugins" !STAR!
4848

4949
if ERRORLEVEL 1 (

‎deps/rabbit/scripts/rabbitmq-queues.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if not defined ERL_CRASH_DUMP_SECONDS (
4343
-kernel inet_dist_listen_min !RABBITMQ_CTL_DIST_PORT_MIN! ^
4444
-kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
4545
-run escript start ^
46-
-escript main rabbitmqctl_escript ^
46+
-escript main Elixir.RabbitMQCtl ^
4747
-extra "%RABBITMQ_HOME%\escript\rabbitmq-queues" !STAR!
4848

4949
if ERRORLEVEL 1 (

‎deps/rabbit/scripts/rabbitmq-streams.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ if not defined ERL_CRASH_DUMP_SECONDS (
4242
-noinput -noshell -hidden -smp enable ^
4343
!RABBITMQ_CTL_ERL_ARGS! ^
4444
-run escript start ^
45-
-escript main rabbitmqctl_escript ^
45+
-escript main Elixir.RabbitMQCtl ^
4646
-extra "%RABBITMQ_HOME%\escript\rabbitmq-streams" !STAR!
4747

4848
if ERRORLEVEL 1 (

‎deps/rabbit/scripts/rabbitmq-upgrade.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if not defined ERL_CRASH_DUMP_SECONDS (
4343
-kernel inet_dist_listen_min !RABBITMQ_CTL_DIST_PORT_MIN! ^
4444
-kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
4545
-run escript start ^
46-
-escript main rabbitmqctl_escript ^
46+
-escript main Elixir.RabbitMQCtl ^
4747
-extra "%RABBITMQ_HOME%\escript\rabbitmq-upgrade" !STAR!
4848

4949
if ERRORLEVEL 1 (

‎deps/rabbit/scripts/rabbitmqctl.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if not defined ERL_CRASH_DUMP_SECONDS (
4343
-kernel inet_dist_listen_min !RABBITMQ_CTL_DIST_PORT_MIN! ^
4444
-kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
4545
-run escript start ^
46-
-escript main rabbitmqctl_escript ^
46+
-escript main Elixir.RabbitMQCtl ^
4747
-extra "%RABBITMQ_HOME%\escript\rabbitmqctl" !STAR!
4848

4949
if ERRORLEVEL 1 (

‎deps/rabbit/scripts/vmware-rabbitmq.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if not defined ERL_CRASH_DUMP_SECONDS (
4343
-kernel inet_dist_listen_min !RABBITMQ_CTL_DIST_PORT_MIN! ^
4444
-kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
4545
-run escript start ^
46-
-escript main rabbitmqctl_escript ^
46+
-escript main Elixir.RabbitMQCtl ^
4747
-extra "%RABBITMQ_HOME%\escript\vmware-rabbitmq" !STAR!
4848

4949
if ERRORLEVEL 1 (

‎deps/rabbit/src/rabbit_amqp_management.erl‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,13 @@ encode_queue(Q, NumMsgs, NumConsumers) ->
437437
{{utf8, <<"durable">>}, {boolean, Durable}},
438438
{{utf8, <<"auto_delete">>}, {boolean, AutoDelete}},
439439
{{utf8, <<"exclusive">>}, {boolean, Exclusive}},
440-
{{utf8, <<"type">>}, {utf8, rabbit_queue_type:to_binary(QType)}},
440+
{{utf8, <<"type">>},
441+
{utf8, case rabbit_queue_type:short_alias_of(QType) of
442+
undefined ->
443+
atom_to_binary(QType);
444+
ShortName ->
445+
ShortName
446+
end}},
441447
{{utf8, <<"arguments">>}, QArgs}
442448
],
443449
KVList1 = if is_list(Replicas) ->

‎deps/rabbit/src/rabbit_amqp_session.erl‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,12 +1498,7 @@ handle_attach(#'v1_0.attach'{role = ?AMQP_ROLE_RECEIVER,
14981498
topic_permission_cache = TopicPermCache},
14991499
rabbit_global_counters:consumer_created(?PROTOCOL),
15001500
{ok, [A], State1};
1501-
{error, Reason} ->
1502-
protocol_error(
1503-
?V_1_0_AMQP_ERROR_INTERNAL_ERROR,
1504-
"Consuming from ~s failed: ~tp",
1505-
[rabbit_misc:rs(QName), Reason]);
1506-
{protocol_error, _Type, Reason, Args} ->
1501+
{error, _Type, Reason, Args} ->
15071502
protocol_error(
15081503
?V_1_0_AMQP_ERROR_INTERNAL_ERROR,
15091504
Reason, Args)

‎deps/rabbit/src/rabbit_amqqueue.erl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1816,8 +1816,7 @@ basic_get(Q, NoAck, LimiterPid, CTag, QStates) ->
18161816
rabbit_framing:amqp_table(), any(), rabbit_types:username(),
18171817
rabbit_queue_type:state()) ->
18181818
{ok, rabbit_queue_type:state()} |
1819-
{error, term()} |
1820-
{protocol_error, Type :: atom(), Reason :: string(), Args :: term()}.
1819+
{error, Type :: atom(), Format :: string(), FormatArgs :: [term()]}.
18211820
basic_consume(Q, NoAck, ChPid, LimiterPid,
18221821
LimiterActive, ConsumerPrefetchCount, ConsumerTag,
18231822
ExclusiveConsume, Args, OkMsg, ActingUser, QStates) ->

0 commit comments

Comments
 (0)