summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-05-21 13:04:57 -0500
committerAlex Gleason <alex@alexgleason.me>2021-05-21 13:04:57 -0500
commit64f4a27d00b30f266374e14a6b008664005e1463 (patch)
tree4dfe472169fb43cd1c01752238a7d98902719d18
parent3b97882499e9969bd13dfadfb9d90038b50e1cac (diff)
Cycles: break compile-time cycles for Plugs by ignoring aliases in module attributes
-rw-r--r--lib/pleroma/config/loader.ex4
-rw-r--r--lib/pleroma/config/transfer_task.ex6
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/pleroma/config/loader.ex b/lib/pleroma/config/loader.ex
index b64d06707..1a027e4f1 100644
--- a/lib/pleroma/config/loader.ex
+++ b/lib/pleroma/config/loader.ex
@@ -4,8 +4,8 @@
defmodule Pleroma.Config.Loader do
@reject_keys [
- Pleroma.Repo,
- Pleroma.Web.Endpoint,
+ Module.concat(["Pleroma.Repo"]),
+ Module.concat(["Pleroma.Web.Endpoint"]),
:env,
:configurable_from_database,
:database,
diff --git a/lib/pleroma/config/transfer_task.ex b/lib/pleroma/config/transfer_task.ex
index aad45aab8..78227312e 100644
--- a/lib/pleroma/config/transfer_task.ex
+++ b/lib/pleroma/config/transfer_task.ex
@@ -16,7 +16,7 @@ defmodule Pleroma.Config.TransferTask do
@reboot_time_keys [
{:pleroma, :hackney_pools},
{:pleroma, :chat},
- {:pleroma, Oban},
+ {:pleroma, Module.concat(["Oban"])},
{:pleroma, :rate_limit},
{:pleroma, :markup},
{:pleroma, :streamer},
@@ -25,8 +25,8 @@ defmodule Pleroma.Config.TransferTask do
]
@reboot_time_subkeys [
- {:pleroma, Pleroma.Captcha, [:seconds_valid]},
- {:pleroma, Pleroma.Upload, [:proxy_remote]},
+ {:pleroma, Module.concat(["Pleroma.Captcha"]), [:seconds_valid]},
+ {:pleroma, Module.concat(["Pleroma.Upload"]), [:proxy_remote]},
{:pleroma, :instance, [:upload_limit]},
{:pleroma, :gopher, [:enabled]}
]