diff options
| -rwxr-xr-x | scripts/rabbitmq-env | 2 | ||||
| -rw-r--r-- | src/rabbit.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_node_monitor.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_vhost_process.erl | 4 |
6 files changed, 21 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 9b4c886051..25ed644c37 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -292,7 +292,7 @@ if [ "${RABBITMQ_DEV_ENV}" ]; then "enabled_plugins_file=\"~s\"~n" "mnesia_base=\"~s\"~n" "mnesia_dir=\"~s\"~n", [P, E, B, M]).' \ - 2>/dev/null | head -n 4) || :) + 2>/dev/null | grep -E '^(plugins_dir|enabled_plugins_file|mnesia_base|mnesia_dir)=') || :) if [ "${plugins_dir}" -a \ "$RABBITMQ_PLUGINS_DIR_source" != 'environment' ]; then RABBITMQ_PLUGINS_DIR="${plugins_dir}" diff --git a/src/rabbit.erl b/src/rabbit.erl index cde1d0ad07..394ae699e3 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -16,6 +16,10 @@ -module(rabbit). +%% Transitional step until we can require Erlang/OTP 21 and +%% use the now recommended try/catch syntax for obtaining the stack trace. +-compile(nowarn_deprecated_function). + -behaviour(application). -export([start/0, boot/0, stop/0, diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index c4cb4e7c13..b2274fe877 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -16,6 +16,10 @@ -module(rabbit_channel). +%% Transitional step until we can require Erlang/OTP 21 and +%% use the now recommended try/catch syntax for obtaining the stack trace. +-compile(nowarn_deprecated_function). + %% rabbit_channel processes represent an AMQP 0-9-1 channels. %% %% Connections parse protocol frames coming from clients and diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl index 4a362eb8a2..808fea8e23 100644 --- a/src/rabbit_node_monitor.erl +++ b/src/rabbit_node_monitor.erl @@ -16,6 +16,10 @@ -module(rabbit_node_monitor). +%% Transitional step until we can require Erlang/OTP 21 and +%% use the now recommended try/catch syntax for obtaining the stack trace. +-compile(nowarn_deprecated_function). + -behaviour(gen_server). -export([start_link/0]). diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 50d7d7e5b2..08ebd2745b 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -16,6 +16,10 @@ -module(rabbit_reader). +%% Transitional step until we can require Erlang/OTP 21 and +%% use the now recommended try/catch syntax for obtaining the stack trace. +-compile(nowarn_deprecated_function). + %% This is an AMQP 0-9-1 connection implementation. If AMQP 1.0 plugin is enabled, %% this module passes control of incoming AMQP 1.0 connections to it. %% diff --git a/src/rabbit_vhost_process.erl b/src/rabbit_vhost_process.erl index f6e4a83daa..043b8b9608 100644 --- a/src/rabbit_vhost_process.erl +++ b/src/rabbit_vhost_process.erl @@ -30,6 +30,10 @@ -module(rabbit_vhost_process). +%% Transitional step until we can require Erlang/OTP 21 and +%% use the now recommended try/catch syntax for obtaining the stack trace. +-compile(nowarn_deprecated_function). + -include("rabbit.hrl"). -define(TICKTIME_RATIO, 4). |