WIP

Author: dumbbell

priv/schema/rabbit.schema

@@ -1,3 +1,4 @@
+% vim:ft=erlang:
 % ==============================
 % Rabbit app section
 % ==============================
@@ -1110,6 +1111,23 @@ end}.
     {validators, ["non_zero_positive_integer"]}
 ]}.
 
+%% Product name & version overrides.
+
+{mapping, "product.name", "rabbit.product_name", [
+    {datatype, string}
+]}.
+{mapping, "product.version", "rabbit.product_version", [
+    {datatype, string}
+]}.
+
+%% Message of the day file.
+%% The content of that file is added to the banners, both logged and
+%% printed.
+
+{mapping, "motd_file", "rabbit.motd_file", [
+    {datatype, string}
+]}.
+
 % ==========================
 % Lager section
 % ==========================

src/rabbit.erl

@@ -380,9 +380,8 @@ run_prelaunch_second_phase() ->
 start_it(StartType) ->
     case spawn_boot_marker() of
         {ok, Marker} ->
-            Product = product_name(),
             T0 = erlang:timestamp(),
-            rabbit_log:info("~s is asked to start...", [Product]),
+            rabbit_log:info("RabbitMQ is asked to start..."),
             try
                 {ok, _} = application:ensure_all_started(rabbitmq_prelaunch,
                                                          StartType),
@@ -392,8 +391,8 @@ start_it(StartType) ->
 
                 T1 = erlang:timestamp(),
                 rabbit_log_prelaunch:debug(
-                  "Time to start ~s: ~p µs",
-                  [Product, timer:now_diff(T1, T0)]),
+                  "Time to start RabbitMQ: ~p µs",
+                  [timer:now_diff(T1, T0)]),
                 stop_boot_marker(Marker),
                 ok
             catch
@@ -1311,7 +1310,6 @@ product_info() ->
                     #{name => NameFromEnv,
                       version => VersionFromEnv};
                 true ->
-                    _ = application:load(rabbit),
                     Name = case NameFromEnv of
                                undefined ->
                                    string_from_app_env(
@@ -1363,12 +1361,22 @@ base_product_version() ->
     rabbit_misc:version().
 
 motd_file() ->
-    case rabbit_env:get_context() of
-        #{motd_file := File} ->
+    %% Precendence is:
+    %%   1. The environment variable;
+    %%   2. The `motd_file` configuration parameter;
+    %%   3. The default value.
+    Context = rabbit_env:get_context(),
+    case Context of
+        #{motd_file := File,
+          var_origins := #{motd_file := environment}}
+          when File =/= undefined ->
             File;
         _ ->
-            _ = application:load(rabbit),
-            string_from_app_env(motd_file, undefined)
+            Default = case Context of
+                          #{motd_file := File} -> File;
+                          _                    -> undefined
+                      end,
+            string_from_app_env(motd_file, Default)
     end.
 
 motd() ->