aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-04-17 09:02:10 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-04-17 09:02:10 +0000
commitd8142ee6fee52529f610c58ba15a39b3e841cdc8 (patch)
tree7f68adc67398581890dd62625bd67ecb61edbf88 /lib
parent9c76d70a4766382abb10a81707b408a8999b97d2 (diff)
parent304ea09f4c9902a1f96f30541e6c5d253527dd47 (diff)
downloadpleroma-d8142ee6fee52529f610c58ba15a39b3e841cdc8.tar.gz
Merge branch 'fix/1694-transfer-task-fix' into 'develop'
Fix for logger configuration Closes #1694 See merge request pleroma/pleroma!2396
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/config/transfer_task.ex9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/pleroma/config/transfer_task.ex b/lib/pleroma/config/transfer_task.ex
index 3871e1cbb..f4722f99d 100644
--- a/lib/pleroma/config/transfer_task.ex
+++ b/lib/pleroma/config/transfer_task.ex
@@ -122,7 +122,7 @@ defmodule Pleroma.Config.TransferTask do
:ok = update_env(:logger, :backends, merged)
end
- defp configure({group, key, _, merged}) do
+ defp configure({_, key, _, merged}) when key in [:console, :ex_syslogger] do
merged =
if key == :console do
put_in(merged[:format], merged[:format] <> "\n")
@@ -136,7 +136,12 @@ defmodule Pleroma.Config.TransferTask do
else: key
Logger.configure_backend(backend, merged)
- :ok = update_env(:logger, group, merged)
+ :ok = update_env(:logger, key, merged)
+ end
+
+ defp configure({_, key, _, merged}) do
+ Logger.configure([{key, merged}])
+ :ok = update_env(:logger, key, merged)
end
defp update({group, key, value, merged}) do