diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2015-01-30 11:56:14 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2015-01-30 11:56:14 +0000 |
| commit | 9388c6613c1789516614077868b1b7417979ddff (patch) | |
| tree | 0dfbeb443034d8e44a4fd65f5a28c8e142c40424 | |
| parent | 3948c08b6ed09c4bd8a2bbfb8e3b40481f86b574 (diff) | |
| parent | c909a478212e7868adf1f5639fad200cb2b9700d (diff) | |
| download | rabbitmq-server-git-9388c6613c1789516614077868b1b7417979ddff.tar.gz | |
Merge in default
| -rwxr-xr-x | scripts/rabbitmq-env | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-plugins | 1 | ||||
| -rwxr-xr-x | scripts/rabbitmq-plugins.bat | 11 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 5a3e73bcaa..8a1b4d6510 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -60,7 +60,7 @@ fi [ "x" = "x$RABBITMQ_USE_LONGNAME" ] && RABBITMQ_USE_LONGNAME=${USE_LONGNAME} if [ "xtrue" = "x$RABBITMQ_USE_LONGNAME" ] ; then RABBITMQ_NAME_TYPE=-name - [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname --fqdn` + [ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname -f` [ "x" = "x$NODENAME" ] && NODENAME=rabbit@${HOSTNAME} else RABBITMQ_NAME_TYPE=-sname diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins index 22fec32f0a..d595620042 100755 --- a/scripts/rabbitmq-plugins +++ b/scripts/rabbitmq-plugins @@ -24,6 +24,7 @@ exec ${ERL_DIR}erl \ -pa "${RABBITMQ_HOME}/ebin" \ -noinput \ -hidden \ + ${RABBITMQ_PLUGINS_ERL_ARGS} \ -boot "${CLEAN_BOOT_FILE}" \ -s rabbit_plugins_main \ -enabled_plugins_file "$RABBITMQ_ENABLED_PLUGINS_FILE" \ diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat index b27a8586b2..a5b441ce17 100755 --- a/scripts/rabbitmq-plugins.bat +++ b/scripts/rabbitmq-plugins.bat @@ -55,7 +55,16 @@ if "!RABBITMQ_PLUGINS_DIR!"=="" ( set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins
)
-"!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!
+"!ERLANG_HOME!\bin\erl.exe" ^
+-pa "!TDP0!..\ebin" ^
+-noinput ^
+-hidden ^
+!RABBITMQ_CTL_ERL_ARGS! ^
+-s rabbit_plugins_main ^
+-enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" ^
+-plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" ^
+-nodename !RABBITMQ_NODENAME! ^
+-extra !STAR!
endlocal
endlocal
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 3f69c9af4f..c6030a090e 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -153,7 +153,6 @@ init_it2(Recover, From, State = #q{q = Q, #amqqueue{} = Q1 -> case matches(Recover, Q, Q1) of true -> - send_reply(From, {new, Q}), ok = file_handle_cache:register_callback( rabbit_amqqueue, set_maximum_since_use, [self()]), ok = rabbit_memory_monitor:register( @@ -161,6 +160,7 @@ init_it2(Recover, From, State = #q{q = Q, set_ram_duration_target, [self()]}), BQ = backing_queue_module(Q1), BQS = bq_init(BQ, Q, TermsOrNew), + send_reply(From, {new, Q}), recovery_barrier(Barrier), State1 = process_args_policy( State#q{backing_queue = BQ, |