diff options
| author | feld <feld@feld.me> | 2023-12-20 22:11:35 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2023-12-20 22:11:35 +0000 |
| commit | 56618873af1aa08f6c271b6cd0f0cbcdfd56bcf1 (patch) | |
| tree | 2f2ec4052b988d2a33ee46f0afe71ee2652fc2aa /config | |
| parent | cbdd134174d0e7a769245af9d3dbf3a2779f8da6 (diff) | |
| parent | d9fe41a301c7d05c4b5757f24b5aa6f3950c7ff1 (diff) | |
| download | pleroma-56618873af1aa08f6c271b6cd0f0cbcdfd56bcf1.tar.gz pleroma-56618873af1aa08f6c271b6cd0f0cbcdfd56bcf1.zip | |
Merge branch 'deprecations' into 'develop'
More deprecation fixes/cleanup
See merge request pleroma/pleroma!4012
Diffstat (limited to 'config')
| -rw-r--r-- | config/benchmark.exs | 2 | ||||
| -rw-r--r-- | config/description.exs | 8 | ||||
| -rw-r--r-- | config/test.exs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/config/benchmark.exs b/config/benchmark.exs index 870ead150..e3e1118ed 100644 --- a/config/benchmark.exs +++ b/config/benchmark.exs @@ -14,7 +14,7 @@ config :pleroma, Pleroma.Captcha, method: Pleroma.Captcha.Mock # Print only warnings and errors during test -config :logger, level: :warn +config :logger, level: :warning config :pleroma, :auth, oauth_consumer_strategies: [] diff --git a/config/description.exs b/config/description.exs index 27e7f7e9b..c1d1aeacc 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1187,7 +1187,7 @@ config :pleroma, :config_description, [ type: [:atom, :tuple, :module], description: "Where logs will be sent, :console - send logs to stdout, { ExSyslogger, :ex_syslogger } - to syslog, Quack.Logger - to Slack.", - suggestions: [:console, {ExSyslogger, :ex_syslogger}, Quack.Logger] + suggestions: [:console, {ExSyslogger, :ex_syslogger}] } ] }, @@ -1202,7 +1202,7 @@ config :pleroma, :config_description, [ key: :level, type: {:dropdown, :atom}, description: "Log level", - suggestions: [:debug, :info, :warn, :error] + suggestions: [:debug, :info, :warning, :error] }, %{ key: :ident, @@ -1235,7 +1235,7 @@ config :pleroma, :config_description, [ key: :level, type: {:dropdown, :atom}, description: "Log level", - suggestions: [:debug, :info, :warn, :error] + suggestions: [:debug, :info, :warning, :error] }, %{ key: :format, @@ -1937,7 +1937,7 @@ config :pleroma, :config_description, [ key: :log, type: {:dropdown, :atom}, description: "Logs verbose mode", - suggestions: [false, :error, :warn, :info, :debug] + suggestions: [false, :error, :warning, :info, :debug] }, %{ key: :queues, diff --git a/config/test.exs b/config/test.exs index cf407ebf2..8a42b863a 100644 --- a/config/test.exs +++ b/config/test.exs @@ -16,7 +16,7 @@ config :pleroma, Pleroma.Captcha, # Print only warnings and errors during test config :logger, :console, - level: :warn, + level: :warning, format: "\n[$level] $message\n" config :pleroma, :auth, oauth_consumer_strategies: [] |