Skip to content

Commit df25461

Browse files
committed
rabbit: Use rabbit_env to get motd filename
1 parent 5fefd5d commit df25461

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

src/rabbit.erl

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,21 +1406,18 @@ motd_file() ->
14061406
%% 1. The environment variable;
14071407
%% 2. The `motd_file` configuration parameter;
14081408
%% 3. The default value.
1409-
case os:getenv("RABBITMQ_MOTD_FILE") of
1410-
false ->
1411-
string_from_app_env(motd_file, default_motd_file());
1412-
Val ->
1413-
Val
1414-
end.
1415-
1416-
default_motd_file() ->
1417-
EnabledPluginsFile = rabbit_plugins:enabled_plugins_file(),
1418-
ConfigDir = filename:dirname(EnabledPluginsFile),
1419-
case os:type() of
1420-
{unix, _} ->
1421-
filename:join(ConfigDir, "motd");
1422-
{win32, _} ->
1423-
filename:join(ConfigDir, "motd.txt")
1409+
Context = rabbit_env:get_context(),
1410+
case Context of
1411+
#{motd_file := File,
1412+
var_origins := #{motd_file := environment}}
1413+
when File =/= undefined ->
1414+
File;
1415+
_ ->
1416+
Default = case Context of
1417+
#{motd_file := File} -> File;
1418+
_ -> undefined
1419+
end,
1420+
string_from_app_env(motd_file, Default)
14241421
end.
14251422

14261423
motd() ->

0 commit comments

Comments
 (0)