Merge pull request #2900 from rabbitmq/mk-erlang-24-compatibility-backports

Erlang 24 compatibility backports for 3.8.x

Author: michaelklishin

deps/rabbit/Makefile

@@ -143,7 +143,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client meck prop
 
 PLT_APPS += mnesia
 
-dep_cuttlefish = hex 2.6.0
+dep_cuttlefish = hex 3.0.0
 dep_syslog = git https://github.com/schlagert/syslog 3.4.5
 
 define usage_xml_to_erl

deps/rabbit/apps/rabbitmq_prelaunch/.gitignore

@@ -5,6 +5,7 @@
 *.coverdata
 /ebin/
 /.erlang.mk/
+/logs/
 /rabbitmq_prelaunch.d
 /xrefr
 

deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state.erl

@@ -36,7 +36,7 @@ get() ->
 
 -spec set(boot_state()) -> ok.
 set(BootState) ->
-    rabbit_log_prelaunch:debug("Change boot state to `~s`", [BootState]),
+    _ = rabbit_log_prelaunch:debug("Change boot state to `~s`", [BootState]),
     ?assert(is_valid(BootState)),
     case BootState of
         stopped -> persistent_term:erase(?PT_KEY_BOOT_STATE);

deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state_systemd.erl

@@ -74,18 +74,18 @@ code_change(_OldVsn, State, _Extra) ->
 
 notify_boot_state(ready = BootState,
                   #state{mechanism = legacy, sd_notify_module = SDNotify}) ->
-    rabbit_log_prelaunch:debug(
+    _ = rabbit_log_prelaunch:debug(
       ?LOG_PREFIX "notifying of state `~s` (via native module)",
       [BootState]),
     sd_notify_legacy(SDNotify);
 notify_boot_state(ready = BootState,
                   #state{mechanism = socat, socket = Socket}) ->
-    rabbit_log_prelaunch:debug(
+    _ = rabbit_log_prelaunch:debug(
       ?LOG_PREFIX "notifying of state `~s` (via socat(1))",
       [BootState]),
     sd_notify_socat(Socket);
 notify_boot_state(BootState, _) ->
-    rabbit_log_prelaunch:debug(
+    _ = rabbit_log_prelaunch:debug(
       ?LOG_PREFIX "ignoring state `~s`",
       [BootState]),
     ok.
@@ -108,7 +108,7 @@ sd_notify_legacy(SDNotify) ->
 sd_notify_socat(Socket) ->
     case sd_current_unit() of
         {ok, Unit} ->
-            rabbit_log_prelaunch:debug(
+            _ = rabbit_log_prelaunch:debug(
               ?LOG_PREFIX "systemd unit for activation check: \"~s\"~n",
               [Unit]),
             sd_notify_socat(Socket, Unit);
@@ -125,7 +125,7 @@ sd_notify_socat(Socket, Unit) ->
             Result
     catch
         Class:Reason ->
-            rabbit_log_prelaunch:debug(
+            _ = rabbit_log_prelaunch:debug(
               ?LOG_PREFIX "Failed to start socat(1): ~p:~p~n",
               [Class, Reason]),
             false
@@ -156,7 +156,7 @@ sd_open_port(Socket) ->
 sd_wait_activation(Port, Unit) ->
     case os:find_executable("systemctl") of
         false ->
-            rabbit_log_prelaunch:debug(
+            _ = rabbit_log_prelaunch:debug(
               ?LOG_PREFIX "systemctl(1) unavailable, falling back to sleep~n"),
             timer:sleep(5000),
             ok;
@@ -165,7 +165,7 @@ sd_wait_activation(Port, Unit) ->
     end.
 
 sd_wait_activation(_, _, 0) ->
-    rabbit_log_prelaunch:debug(
+    _ = rabbit_log_prelaunch:debug(
       ?LOG_PREFIX "service still in 'activating' state, bailing out~n"),
     ok;
 sd_wait_activation(Port, Unit, AttemptsLeft) ->
@@ -177,7 +177,7 @@ sd_wait_activation(Port, Unit, AttemptsLeft) ->
         "ActiveState=" ++ _ ->
             ok;
         _ = Err ->
-            rabbit_log_prelaunch:debug(
+            _ = rabbit_log_prelaunch:debug(
               ?LOG_PREFIX "unexpected status from systemd: ~p~n", [Err]),
             ok
     end.

deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_prelaunch.erl

@@ -72,14 +72,14 @@ do_run() ->
     IsInitialPass = is_initial_pass(),
     case IsInitialPass of
         true ->
-            rabbit_log_prelaunch:debug(""),
-            rabbit_log_prelaunch:debug(
+            _ = rabbit_log_prelaunch:debug(""),
+            _ = rabbit_log_prelaunch:debug(
               "== Prelaunch phase [1/2] (initial pass) =="),
-            rabbit_log_prelaunch:debug("");
+            _ = rabbit_log_prelaunch:debug("");
         false ->
-            rabbit_log_prelaunch:debug(""),
-            rabbit_log_prelaunch:debug("== Prelaunch phase [1/2] =="),
-            rabbit_log_prelaunch:debug("")
+            _ = rabbit_log_prelaunch:debug(""),
+            _ = rabbit_log_prelaunch:debug("== Prelaunch phase [1/2] =="),
+            _ = rabbit_log_prelaunch:debug("")
     end,
     rabbit_env:log_process_env(),
 
@@ -111,7 +111,7 @@ do_run() ->
     ok = rabbit_prelaunch_dist:setup(Context),
 
     %% 4. Write PID file.
-    rabbit_log_prelaunch:debug(""),
+    _ = rabbit_log_prelaunch:debug(""),
     _ = write_pid_file(Context),
     ignore.
 
@@ -138,7 +138,7 @@ get_stop_reason() ->
 set_stop_reason(Reason) ->
     case get_stop_reason() of
         undefined ->
-            rabbit_log_prelaunch:debug("Set stop reason to: ~p", [Reason]),
+            _ = rabbit_log_prelaunch:debug("Set stop reason to: ~p", [Reason]),
             persistent_term:put(?PT_KEY_STOP_REASON, Reason);
         _ ->
             ok
@@ -161,7 +161,7 @@ setup_shutdown_func() ->
         {ok, {ThisMod, ThisFunc}} ->
             ok;
         {ok, {ExistingMod, ExistingFunc}} ->
-            rabbit_log_prelaunch:debug(
+            _ = rabbit_log_prelaunch:debug(
               "Setting up kernel shutdown function: ~s:~s/1 "
               "(chained with ~s:~s/1)",
               [ThisMod, ThisFunc, ExistingMod, ExistingFunc]),
@@ -170,7 +170,7 @@ setup_shutdown_func() ->
                    ExistingShutdownFunc),
             ok = record_kernel_shutdown_func(ThisMod, ThisFunc);
         _ ->
-            rabbit_log_prelaunch:debug(
+            _ = rabbit_log_prelaunch:debug(
               "Setting up kernel shutdown function: ~s:~s/1",
               [ThisMod, ThisFunc]),
             ok = record_kernel_shutdown_func(ThisMod, ThisFunc)
@@ -182,7 +182,7 @@ record_kernel_shutdown_func(Mod, Func) ->
       [{persistent, true}]).
 
 shutdown_func(Reason) ->
-    rabbit_log_prelaunch:debug(
+    _ = rabbit_log_prelaunch:debug(
       "Running ~s:shutdown_func() as part of `kernel` shutdown", [?MODULE]),
     Context = get_context(),
     remove_pid_file(Context),
@@ -195,21 +195,21 @@ shutdown_func(Reason) ->
     end.
 
 write_pid_file(#{pid_file := PidFile}) ->
-    rabbit_log_prelaunch:debug("Writing PID file: ~s", [PidFile]),
+    _ = rabbit_log_prelaunch:debug("Writing PID file: ~s", [PidFile]),
     case filelib:ensure_dir(PidFile) of
         ok ->
             OSPid = os:getpid(),
             case file:write_file(PidFile, OSPid) of
                 ok ->
                     ok;
                 {error, Reason} = Error ->
-                    rabbit_log_prelaunch:warning(
+                    _ = rabbit_log_prelaunch:warning(
                       "Failed to write PID file \"~s\": ~s",
                       [PidFile, file:format_error(Reason)]),
                     Error
             end;
         {error, Reason} = Error ->
-            rabbit_log_prelaunch:warning(
+            _ = rabbit_log_prelaunch:warning(
               "Failed to create PID file \"~s\" directory: ~s",
               [PidFile, file:format_error(Reason)]),
             Error
@@ -218,10 +218,10 @@ write_pid_file(_) ->
     ok.
 
 remove_pid_file(#{pid_file := PidFile, keep_pid_file_on_exit := true}) ->
-    rabbit_log_prelaunch:debug("Keeping PID file: ~s", [PidFile]),
+    _ = rabbit_log_prelaunch:debug("Keeping PID file: ~s", [PidFile]),
     ok;
 remove_pid_file(#{pid_file := PidFile}) ->
-    rabbit_log_prelaunch:debug("Deleting PID file: ~s", [PidFile]),
+    _ = rabbit_log_prelaunch:debug("Deleting PID file: ~s", [PidFile]),
     _ = file:delete(PidFile),
     ok;
 remove_pid_file(_) ->