projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of akkoma.dev:AkkomaGang/akkoma into develop
[akkoma]
/
lib
/
pleroma
/
config
/
transfer_task.ex
diff --git
a/lib/pleroma/config/transfer_task.ex
b/lib/pleroma/config/transfer_task.ex
index d5c6081a240834a03222bf336f43b42398348582..52f6346a550788cb75d7eb0bffa175527c60a7c9 100644
(file)
--- a/
lib/pleroma/config/transfer_task.ex
+++ b/
lib/pleroma/config/transfer_task.ex
@@
-15,14
+15,10
@@
defmodule Pleroma.Config.TransferTask do
defp reboot_time_keys,
do: [
defp reboot_time_keys,
do: [
- {:pleroma, :hackney_pools},
- {:pleroma, :shout},
{:pleroma, Oban},
{:pleroma, :rate_limit},
{:pleroma, :markup},
{:pleroma, Oban},
{:pleroma, :rate_limit},
{:pleroma, :markup},
- {:pleroma, :streamer},
- {:pleroma, :pools},
- {:pleroma, :connections_pool}
+ {:pleroma, :streamer}
]
defp reboot_time_subkeys,
]
defp reboot_time_subkeys,
@@
-30,7
+26,8
@@
defmodule Pleroma.Config.TransferTask do
{:pleroma, Pleroma.Captcha, [:seconds_valid]},
{:pleroma, Pleroma.Upload, [:proxy_remote]},
{:pleroma, :instance, [:upload_limit]},
{:pleroma, Pleroma.Captcha, [:seconds_valid]},
{:pleroma, Pleroma.Upload, [:proxy_remote]},
{:pleroma, :instance, [:upload_limit]},
- {:pleroma, :gopher, [:enabled]}
+ {:pleroma, :http, [:pool_size]},
+ {:pleroma, :http, [:proxy_url]}
]
def start_link(restart_pleroma? \\ true) do
]
def start_link(restart_pleroma? \\ true) do
@@
-43,11
+40,11
@@
defmodule Pleroma.Config.TransferTask do
def load_and_update_env(deleted_settings \\ [], restart_pleroma? \\ true) do
with {_, true} <- {:configurable, Config.get(:configurable_from_database)} do
# We need to restart applications for loaded settings take effect
def load_and_update_env(deleted_settings \\ [], restart_pleroma? \\ true) do
with {_, true} <- {:configurable, Config.get(:configurable_from_database)} do
# We need to restart applications for loaded settings take effect
-
{logger, other} =
(Repo.all(ConfigDB) ++ deleted_settings)
{logger, other} =
(Repo.all(ConfigDB) ++ deleted_settings)
+ |> Enum.reject(&invalid_key_or_group/1)
|> Enum.map(&merge_with_default/1)
|> Enum.map(&merge_with_default/1)
- |> Enum.split_with(fn {group, _, _, _} -> group
in [:logger, :quack]
end)
+ |> Enum.split_with(fn {group, _, _, _} -> group
== :logger
end)
logger
|> Enum.sort()
logger
|> Enum.sort()
@@
-55,8
+52,7
@@
defmodule Pleroma.Config.TransferTask do
started_applications = Application.started_applications()
started_applications = Application.started_applications()
- # TODO: some problem with prometheus after restart!
- reject = [nil, :prometheus, :postgrex]
+ reject = [nil, :postgrex]
reject =
if restart_pleroma? do
reject =
if restart_pleroma? do
@@
-90,8
+86,17
@@
defmodule Pleroma.Config.TransferTask do
end
end
end
end
+ defp invalid_key_or_group(%ConfigDB{key: :invalid_atom}), do: true
+ defp invalid_key_or_group(%ConfigDB{group: :invalid_atom}), do: true
+ defp invalid_key_or_group(_), do: false
+
defp merge_with_default(%{group: group, key: key, value: value} = setting) do
defp merge_with_default(%{group: group, key: key, value: value} = setting) do
- default = Config.Holder.default_config(group, key)
+ default =
+ if group == :pleroma do
+ Config.get([key], Config.Holder.default_config(group, key))
+ else
+ Config.Holder.default_config(group, key)
+ end
merged =
cond do
merged =
cond do
@@
-103,12
+108,6
@@
defmodule Pleroma.Config.TransferTask do
{group, key, value, merged}
end
{group, key, value, merged}
end
- # change logger configuration in runtime, without restart
- defp configure({:quack, key, _, merged}) do
- Logger.configure_backend(Quack.Logger, [{key, merged}])
- :ok = update_env(:quack, key, merged)
- end
-
defp configure({_, :backends, _, merged}) do
# removing current backends
Enum.each(Application.get_env(:logger, :backends), &Logger.remove_backend/1)
defp configure({_, :backends, _, merged}) do
# removing current backends
Enum.each(Application.get_env(:logger, :backends), &Logger.remove_backend/1)
@@
-148,9
+147,7
@@
defmodule Pleroma.Config.TransferTask do
rescue
error ->
error_msg =
rescue
error ->
error_msg =
- "updating env causes error, group: #{inspect(group)}, key: #{inspect(key)}, value: #{
- inspect(value)
- } error: #{inspect(error)}"
+ "updating env causes error, group: #{inspect(group)}, key: #{inspect(key)}, value: #{inspect(value)} error: #{inspect(error)}"
Logger.warn(error_msg)
Logger.warn(error_msg)