projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocke...
[akkoma]
/
lib
/
pleroma
/
config
/
transfer_task.ex
diff --git
a/lib/pleroma/config/transfer_task.ex
b/lib/pleroma/config/transfer_task.ex
index 3871e1cbb3fa075d619bebadf45a082ef050ee01..f4722f99d36acc510163779241f39f7e230dcec2 100644
(file)
--- 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
: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")
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)
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
end
defp update({group, key, value, merged}) do