1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2026-02-15 17:16:57 +00:00
This commit is contained in:
Phantasm 2026-01-13 20:44:26 +01:00
parent 6bfc2f05ae
commit 093053257e
No known key found for this signature in database
GPG key ID: 2669E588BCC634C8
4 changed files with 12 additions and 9 deletions

View file

@ -418,11 +418,11 @@ defmodule Pleroma.Config.DeprecationWarnings do
end
@spec check_deprecated_logger_config() :: :ok | :error
def check_deprecated_logger_config() do
def check_deprecated_logger_config do
if Application.get_env(:logger, :backends) do
Logger.warning(
"'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. " <>
"Use 'config :pleroma, :logger, backends: [...]' instead."
"Use 'config :pleroma, :logger, backends: [...]' instead."
)
:error

View file

@ -10,7 +10,6 @@ defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicy do
alias Pleroma.Web.ActivityPub.MRF.Utils
use Pleroma.Web.ActivityPub.MRF.Policy
defp string_matches?(string, pattern) when is_binary(pattern) do

View file

@ -15,7 +15,9 @@ defmodule Pleroma.ApplicationTest do
test "is handled" do
log = capture_log(fn -> Pleroma.Application.configure_logger() end)
assert log =~ "Configuration {:ex_syslogger, :ex_syslogger} is incorrect. Use {ExSyslogger, :ex_syslogger} instead!"
assert log =~
"Configuration {:ex_syslogger, :ex_syslogger} is incorrect. Use {ExSyslogger, :ex_syslogger} instead!"
assert log =~ "Successfully added logger backend: {ExSyslogger, :ex_syslogger}"
end
end
@ -27,7 +29,7 @@ defmodule Pleroma.ApplicationTest do
test "emits a warning" do
assert capture_log(fn -> Pleroma.Application.configure_logger() end) =~
":console is no longer considered a backend and is enabled by default"
":console is no longer considered a backend and is enabled by default"
end
end
end

View file

@ -394,13 +394,15 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
Application.put_env(:logger, :backends, [:console, {ExSyslogger, :ex_syslogger}])
on_exit(fn ->
Application.delete_env(:logger, :backends) end)
Application.delete_env(:logger, :backends)
end)
end
test "warns on deprecated syntax" do
assert capture_log(fn -> Pleroma.Config.DeprecationWarnings.check_deprecated_logger_config() end) =~
"'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. Use 'config :pleroma, :logger, backends: [...]' instead."
assert capture_log(fn ->
Pleroma.Config.DeprecationWarnings.check_deprecated_logger_config()
end) =~
"'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. Use 'config :pleroma, :logger, backends: [...]' instead."
end
end
end