Skip to content

Commit 293f87b

Browse files
Merge pull request #1622 from rabbitmq/erlang-otp-21-compatibility
Erlang/OTP 21 compatibility
2 parents f8473d5 + 924819c commit 293f87b

File tree

6 files changed

+21
-1
lines changed

6 files changed

+21
-1
lines changed

scripts/rabbitmq-env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ if [ "${RABBITMQ_DEV_ENV}" ]; then
292292
"enabled_plugins_file=\"~s\"~n"
293293
"mnesia_base=\"~s\"~n"
294294
"mnesia_dir=\"~s\"~n", [P, E, B, M]).' \
295-
2>/dev/null | head -n 4) || :)
295+
2>/dev/null | grep -E '^(plugins_dir|enabled_plugins_file|mnesia_base|mnesia_dir)=') || :)
296296
if [ "${plugins_dir}" -a \
297297
"$RABBITMQ_PLUGINS_DIR_source" != 'environment' ]; then
298298
RABBITMQ_PLUGINS_DIR="${plugins_dir}"

src/rabbit.erl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616

1717
-module(rabbit).
1818

19+
%% Transitional step until we can require Erlang/OTP 21 and
20+
%% use the now recommended try/catch syntax for obtaining the stack trace.
21+
-compile(nowarn_deprecated_function).
22+
1923
-behaviour(application).
2024

2125
-export([start/0, boot/0, stop/0,

src/rabbit_channel.erl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616

1717
-module(rabbit_channel).
1818

19+
%% Transitional step until we can require Erlang/OTP 21 and
20+
%% use the now recommended try/catch syntax for obtaining the stack trace.
21+
-compile(nowarn_deprecated_function).
22+
1923
%% rabbit_channel processes represent an AMQP 0-9-1 channels.
2024
%%
2125
%% Connections parse protocol frames coming from clients and

src/rabbit_node_monitor.erl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616

1717
-module(rabbit_node_monitor).
1818

19+
%% Transitional step until we can require Erlang/OTP 21 and
20+
%% use the now recommended try/catch syntax for obtaining the stack trace.
21+
-compile(nowarn_deprecated_function).
22+
1923
-behaviour(gen_server).
2024

2125
-export([start_link/0]).

src/rabbit_reader.erl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616

1717
-module(rabbit_reader).
1818

19+
%% Transitional step until we can require Erlang/OTP 21 and
20+
%% use the now recommended try/catch syntax for obtaining the stack trace.
21+
-compile(nowarn_deprecated_function).
22+
1923
%% This is an AMQP 0-9-1 connection implementation. If AMQP 1.0 plugin is enabled,
2024
%% this module passes control of incoming AMQP 1.0 connections to it.
2125
%%

src/rabbit_vhost_process.erl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030

3131
-module(rabbit_vhost_process).
3232

33+
%% Transitional step until we can require Erlang/OTP 21 and
34+
%% use the now recommended try/catch syntax for obtaining the stack trace.
35+
-compile(nowarn_deprecated_function).
36+
3337
-include("rabbit.hrl").
3438

3539
-define(TICKTIME_RATIO, 4).

0 commit comments

Comments
 (0)