From fb415d304e76a7113994829186d13a517df3c04c Mon Sep 17 00:00:00 2001
From: Phantasm <phantasm@centrum.cz>
Date: Wed, 21 Jan 2026 20:02:26 +0100
Subject: [PATCH] Elixir 1.19: Set merged logger config correctly, remove log
 level test

---
 lib/pleroma/config/deprecation_warnings.ex    | 29 +++++++++---------
 .../config/deprecation_warnings_test.exs      | 30 +++++--------------
 2 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex
index 4f68c141cb..e777854833 100644
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@@ -20,8 +20,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
      "\n* `config :pleroma, :instance, mrf_transparency_exclusions` is now `config :pleroma, :mrf, transparency_exclusions`"}
   ]
 
-  @logger_config_knobs [:level, :translator_inspect_opts]
-  @logger_formatter_config_knows [:colors, :format, :metadata, :truncate, :utc_log]
+  @logger_formatter_config_knobs [:colors, :format, :metadata, :truncate, :utc_log]
 
   def check_exiftool_filter do
     filters = Config.get([Pleroma.Upload]) |> Keyword.get(:filters, [])
@@ -421,21 +420,23 @@ defmodule Pleroma.Config.DeprecationWarnings do
   end
 
   defp merge_deprecated_logger_config(config) do
-    handler_config = Enum.filter(config, fn {k, _} -> k in @logger_config_knobs end)
-    formatter_config = Enum.filter(config, fn {k, _} -> k in @logger_formatter_config_knows end)
+    formatter_config = Enum.filter(config, fn {k, _} -> k in @logger_formatter_config_knobs end)
     formatter = Logger.default_formatter(formatter_config)
+    log_level = Keyword.get(config, :level, nil)
 
-    Logger.debug("""
-    Reconfiguring console Logger with deprecated configuration syntax.
-      Handler configuration:
-        #{inspect(handler_config)}
+    if Config.get(:env) != :test do
+      Logger.debug("""
+      Reconfiguring console Logger with deprecated configuration syntax.
+        Handler configuration:
+          log_level: #{inspect(log_level)}
 
-      Formatter:
-        #{inspect(formatter)}
-    """)
+        Formatter:
+          #{inspect(formatter)}
+      """)
 
-    Logger.configure(handler_config)
-    :logger.update_handler_config(:default, :formatter, formatter)
+      if log_level, do: :logger.update_handler_config(:default, :level, log_level)
+      :logger.update_handler_config(:default, :formatter, formatter)
+    end
   end
 
   @spec check_deprecated_logger_config() :: :ok | :error
@@ -443,7 +444,7 @@ defmodule Pleroma.Config.DeprecationWarnings do
     backends_config = Application.get_env(:logger, :backends)
     console_config = Application.get_env(:logger, :console)
 
-    # Note: No need to merge the old backends config since it still works.
+    # NOTE: No need to merge the old backends config since it still works.
     # And new configuration will just add new Logger backends.
     backend =
       if backends_config do
diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index 221609da07..475a88c4dd 100644
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Config.DeprecationWarningsTest do
-  use ExUnit.Case
+  use ExUnit.Case, async: false
   use Pleroma.Tests.Helpers
 
   import ExUnit.CaptureLog
@@ -393,14 +393,15 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
 
   describe "check_deprecated_logger_config" do
     setup do
-      Application.put_env(:logger, :backends, [:console, {ExSyslogger, :ex_syslogger}])
-      Application.put_env(:logger, :console, level: :info)
+      initial_console = Application.get_env(:logger, :console, nil)
+      initial_backends = Application.get_env(:logger, :backends, nil)
+
+      Application.put_env(:logger, :console, level: :all)
+      Application.put_env(:logger, :backends, [:console])
 
       on_exit(fn ->
-        Application.delete_env(:logger, :backends)
-        Application.delete_env(:logger, :console)
-        Logger.configure(level: :debug)
-        :logger.update_handler_config(:default, :formatter, Logger.default_formatter())
+        if initial_console, do: Application.put_env(:logger, :console, initial_console), else: Application.delete_env(:logger, :console)
+        if initial_backends, do: Application.put_env(:logger, :backends, initial_backends), else: Application.delete_env(:logger, :backends)
       end)
     end
 
@@ -434,20 +435,5 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
                `:default_formatter`. For more info visit: https://hexdocs.pm/logger/Logger.html#module-backends-and-backwards-compatibility
                """
     end
-
-    test "reconfigures logger" do
-      empty_log =
-        capture_log(fn ->
-          Logger.debug("This should not be logged")
-        end)
-
-      logged =
-        capture_log(fn ->
-          Logger.info("This should be logged")
-        end)
-
-      assert empty_log =~ ""
-      assert logged =~ "This should be logged"
-    end
   end
 end