Skip to content

Commit 05d9b5d

Browse files
author
Simon MacMullen
committed
stable to default
2 parents d6453f1 + 0a4b964 commit 05d9b5d

Some content is hidden

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

46 files changed

+1964
-844
lines changed

‎docs/rabbitmq.config.example

+8-3
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
%% {handshake_timeout, 10000},
3434

3535
%% Log levels (currently just used for connection logging).
36-
%% One of 'info', 'warning', 'error' or 'none', in decreasing order
37-
%% of verbosity. Defaults to 'info'.
36+
%% One of 'debug', 'info', 'warning', 'error' or 'none', in decreasing
37+
%% order of verbosity. Defaults to 'info'.
3838
%%
3939
%% {log_levels, [{connection, info}]},
4040

@@ -235,7 +235,12 @@
235235
%% Timeout used when waiting for Mnesia tables in a cluster to
236236
%% become available.
237237
%%
238-
%% {mnesia_table_loading_timeout, 30000}
238+
%% {mnesia_table_loading_timeout, 30000},
239+
240+
%% Size in bytes below which to embed messages in the queue index. See
241+
%% http://www.rabbitmq.com/persistence-conf.html
242+
%%
243+
%% {queue_index_embed_msgs_below, 4096}
239244

240245
]},
241246

‎docs/rabbitmqctl.1.xml

+35
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,41 @@
425425
</para>
426426
</listitem>
427427
</varlistentry>
428+
<varlistentry>
429+
<term><cmdsynopsis><command>rename_cluster_node</command> <arg choice="req">oldnode1</arg> <arg choice="req">newnode1</arg> <arg choice="opt">oldnode2</arg> <arg choice="opt">newnode2 ...</arg></cmdsynopsis></term>
430+
<listitem>
431+
<para>
432+
Supports renaming of cluster nodes in the local database.
433+
</para>
434+
<para>
435+
This subcommand causes rabbitmqctl to temporarily become
436+
the node in order to make the change. The local cluster
437+
node must therefore be completely stopped; other nodes
438+
can be online or offline.
439+
</para>
440+
<para>
441+
This subcommand takes an even number of arguments, in
442+
pairs representing the old and new names for nodes. You
443+
must specify the old and new names for this node and for
444+
any other nodes that are stopped and being renamed at
445+
the same time.
446+
</para>
447+
<para>
448+
It is possible to stop all nodes and rename them all
449+
simultaneously (in which case old and new names for all
450+
nodes must be given to every node) or stop and rename
451+
nodes one at a time (in which case each node only needs
452+
to be told how its own name is changing).
453+
</para>
454+
<para role="example-prefix">For example:</para>
455+
<screen role="example">rabbitmqctl rename_cluster_node rabbit@misshelpful rabbit@cordelia</screen>
456+
<para role="example">
457+
This command will rename the node
458+
<command>rabbit@misshelpful</command> to the node
459+
<command>rabbit@cordelia</command>.
460+
</para>
461+
</listitem>
462+
</varlistentry>
428463
<varlistentry>
429464
<term><cmdsynopsis><command>update_cluster_nodes</command> <arg choice="req">clusternode</arg></cmdsynopsis>
430465
</term>

‎ebin/rabbit_app.in

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
{heartbeat, 580},
3030
{msg_store_file_size_limit, 16777216},
3131
{queue_index_max_journal_entries, 65536},
32+
{queue_index_embed_msgs_below, 4096},
3233
{default_user, <<"guest">>},
3334
{default_pass, <<"guest">>},
3435
{default_user_tags, [administrator]},

‎include/rabbit.hrl

+9-4
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,17 @@
1414
%% Copyright (c) 2007-2014 GoPivotal, Inc. All rights reserved.
1515
%%
1616

17+
%% Passed around most places
1718
-record(user, {username,
1819
tags,
19-
auth_backend, %% Module this user came from
20-
impl %% Scratch space for that module
21-
}).
20+
authz_backends}). %% List of {Module, AuthUserImpl} pairs
2221

22+
%% Passed to auth backends
23+
-record(auth_user, {username,
24+
tags,
25+
impl}).
26+
27+
%% Implementation for the internal auth backend
2328
-record(internal_user, {username, password_hash, tags}).
2429
-record(permission, {configure, write, read}).
2530
-record(user_vhost, {username, virtual_host}).
@@ -83,7 +88,7 @@
8388
is_persistent}).
8489

8590
-record(ssl_socket, {tcp, ssl}).
86-
-record(delivery, {mandatory, confirm, sender, message, msg_seq_no}).
91+
-record(delivery, {mandatory, confirm, sender, message, msg_seq_no, flow}).
8792
-record(amqp_error, {name, explanation = "", method = none}).
8893

8994
-record(event, {type, props, reference = undefined, timestamp}).

‎packaging/windows/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ dist:
77
tar -zxf ../../dist/$(SOURCE_DIR).tar.gz
88
$(MAKE) -C $(SOURCE_DIR)
99

10-
mkdir $(SOURCE_DIR)/sbin
10+
mkdir -p $(SOURCE_DIR)/sbin
1111
mv $(SOURCE_DIR)/scripts/*.bat $(SOURCE_DIR)/sbin
12-
mkdir $(SOURCE_DIR)/etc
12+
mkdir -p $(SOURCE_DIR)/etc
1313
cp $(SOURCE_DIR)/docs/rabbitmq.config.example $(SOURCE_DIR)/etc/rabbitmq.config.example
1414
cp README-etc $(SOURCE_DIR)/etc/README.txt
1515
rm -rf $(SOURCE_DIR)/scripts

‎scripts/rabbitmq-plugins

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
# Non-empty defaults should be set in rabbitmq-env
2020
. `dirname $0`/rabbitmq-env
2121

22+
RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \
2223
exec ${ERL_DIR}erl \
2324
-pa "${RABBITMQ_HOME}/ebin" \
2425
-noinput \
2526
-hidden \
26-
${RABBITMQ_NAME_TYPE} rabbitmq-plugins$$ \
2727
-boot "${CLEAN_BOOT_FILE}" \
2828
-s rabbit_plugins_main \
2929
-enabled_plugins_file "$RABBITMQ_ENABLED_PLUGINS_FILE" \

‎scripts/rabbitmq-plugins.bat

+1-9
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ set TDP0=%~dp0
2323
set STAR=%*
2424
setlocal enabledelayedexpansion
2525

26-
if "!RABBITMQ_USE_LONGNAME!"=="" (
27-
set RABBITMQ_NAME_TYPE="-sname"
28-
)
29-
30-
if "!RABBITMQ_USE_LONGNAME!"=="true" (
31-
set RABBITMQ_NAME_TYPE="-name"
32-
)
33-
3426
if "!RABBITMQ_SERVICENAME!"=="" (
3527
set RABBITMQ_SERVICENAME=RabbitMQ
3628
)
@@ -63,7 +55,7 @@ if "!RABBITMQ_PLUGINS_DIR!"=="" (
6355
set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins
6456
)
6557

66-
"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden !RABBITMQ_NAME_TYPE! rabbitmq-plugins!RANDOM!!TIME:~9! -s rabbit_plugins_main -enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -nodename !RABBITMQ_NODENAME! -extra !STAR!
58+
"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden -s rabbit_plugins_main -enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -nodename !RABBITMQ_NODENAME! -extra !STAR!
6759

6860
endlocal
6961
endlocal

‎scripts/rabbitmqctl

-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
# Non-empty defaults should be set in rabbitmq-env
2020
. `dirname $0`/rabbitmq-env
2121

22-
# rabbitmqctl starts distribution itself, so we need to make sure epmd
23-
# is running.
24-
${ERL_DIR}erl ${RABBITMQ_NAME_TYPE} rabbitmqctl-prelaunch-$$ -noinput \
25-
-eval 'erlang:halt().' -boot "${CLEAN_BOOT_FILE}"
26-
2722
# We specify Mnesia dir and sasl error logger since some actions
2823
# (e.g. forget_cluster_node --offline) require us to impersonate the
2924
# real node.

‎scripts/rabbitmqctl.bat

-12
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,6 @@ if "!RABBITMQ_BASE!"=="" (
2727
set RABBITMQ_BASE=!APPDATA!\RabbitMQ
2828
)
2929

30-
if "!RABBITMQ_USE_LONGNAME!"=="" (
31-
set RABBITMQ_NAME_TYPE="-sname"
32-
)
33-
34-
if "!RABBITMQ_USE_LONGNAME!"=="true" (
35-
set RABBITMQ_NAME_TYPE="-name"
36-
)
37-
3830
if "!COMPUTERNAME!"=="" (
3931
set COMPUTERNAME=localhost
4032
)
@@ -63,10 +55,6 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
6355
exit /B
6456
)
6557

66-
rem rabbitmqctl starts distribution itself, so we need to make sure epmd
67-
rem is running.
68-
"!ERLANG_HOME!\bin\erl.exe" !RABBITMQ_NAME_TYPE! rabbitmqctl-prelaunch-!RANDOM!!TIME:~9! -noinput -eval "erlang:halt()."
69-
7058
"!ERLANG_HOME!\bin\erl.exe" ^
7159
-pa "!TDP0!..\ebin" ^
7260
-noinput ^

0 commit comments

Comments
 (0)