projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into default-db-name
[akkoma]
/
lib
/
pleroma
/
application.ex
diff --git
a/lib/pleroma/application.ex
b/lib/pleroma/application.ex
index 0f4f5a358d4a5c9555b19db17fb488141d2600a2..fcb1d65711c0d799e8635b9d90f7148a862608da 100644
(file)
--- a/
lib/pleroma/application.ex
+++ b/
lib/pleroma/application.ex
@@
-58,9
+58,6
@@
defmodule Pleroma.Application do
Pleroma.Docs.JSON.compile()
limiters_setup()
Pleroma.Docs.JSON.compile()
limiters_setup()
- Logger.info("Starting Finch")
- Finch.start_link(name: MyFinch)
-
# Define workers and child supervisors to be supervised
children =
[
# Define workers and child supervisors to be supervised
children =
[
@@
-70,6
+67,7
@@
defmodule Pleroma.Application do
Pleroma.Web.Plugs.RateLimiter.Supervisor
] ++
cachex_children() ++
Pleroma.Web.Plugs.RateLimiter.Supervisor
] ++
cachex_children() ++
+ http_children() ++
[
Pleroma.Stats,
Pleroma.JobQueueMonitor,
[
Pleroma.Stats,
Pleroma.JobQueueMonitor,
@@
-276,4
+274,13
@@
defmodule Pleroma.Application do
ConcurrentLimiter.new(module, max_running, max_waiting)
end)
end
ConcurrentLimiter.new(module, max_running, max_waiting)
end)
end
+
+ defp http_children do
+ config =
+ [:http, :adapter]
+ |> Config.get([])
+ |> Keyword.put(:name, MyFinch)
+
+ [{Finch, config}]
+ end
end
end