Lint
This commit is contained in:
parent
c455e02255
commit
a4c929c527
4 changed files with 12 additions and 9 deletions
|
|
@ -418,11 +418,11 @@ defmodule Pleroma.Config.DeprecationWarnings do
|
||||||
end
|
end
|
||||||
|
|
||||||
@spec check_deprecated_logger_config() :: :ok | :error
|
@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
|
if Application.get_env(:logger, :backends) do
|
||||||
Logger.warning(
|
Logger.warning(
|
||||||
"'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. " <>
|
"'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. " <>
|
||||||
"Use 'config :pleroma, :logger, backends: [...]' instead."
|
"Use 'config :pleroma, :logger, backends: [...]' instead."
|
||||||
)
|
)
|
||||||
|
|
||||||
:error
|
:error
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,6 @@ defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicy do
|
||||||
|
|
||||||
alias Pleroma.Web.ActivityPub.MRF.Utils
|
alias Pleroma.Web.ActivityPub.MRF.Utils
|
||||||
|
|
||||||
|
|
||||||
use Pleroma.Web.ActivityPub.MRF.Policy
|
use Pleroma.Web.ActivityPub.MRF.Policy
|
||||||
|
|
||||||
defp string_matches?(string, pattern) when is_binary(pattern) do
|
defp string_matches?(string, pattern) when is_binary(pattern) do
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,9 @@ defmodule Pleroma.ApplicationTest do
|
||||||
test "is handled" do
|
test "is handled" do
|
||||||
log = capture_log(fn -> Pleroma.Application.configure_logger() end)
|
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}"
|
assert log =~ "Successfully added logger backend: {ExSyslogger, :ex_syslogger}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -27,7 +29,7 @@ defmodule Pleroma.ApplicationTest do
|
||||||
|
|
||||||
test "emits a warning" do
|
test "emits a warning" do
|
||||||
assert capture_log(fn -> Pleroma.Application.configure_logger() end) =~
|
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
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -394,13 +394,15 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
|
||||||
Application.put_env(:logger, :backends, [:console, {ExSyslogger, :ex_syslogger}])
|
Application.put_env(:logger, :backends, [:console, {ExSyslogger, :ex_syslogger}])
|
||||||
|
|
||||||
on_exit(fn ->
|
on_exit(fn ->
|
||||||
Application.delete_env(:logger, :backends) end)
|
Application.delete_env(:logger, :backends)
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
test "warns on deprecated syntax" do
|
test "warns on deprecated syntax" do
|
||||||
assert capture_log(fn -> Pleroma.Config.DeprecationWarnings.check_deprecated_logger_config() end) =~
|
assert capture_log(fn ->
|
||||||
"'config :logger, backends: [...]' is deprecated syntax due to changes in Elixir. Use 'config :pleroma, :logger, backends: [...]' instead."
|
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
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue