projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job...
[akkoma]
/
lib
/
pleroma
/
application.ex
diff --git
a/lib/pleroma/application.ex
b/lib/pleroma/application.ex
index 7d38ed5c4c1c247fafbe46a7e27ea9876432a733..0c27027a0ec1de9ca2640d798526d4d80c97ea5a 100644
(file)
--- a/
lib/pleroma/application.ex
+++ b/
lib/pleroma/application.ex
@@
-36,14
+36,14
@@
defmodule Pleroma.Application do
Pleroma.Emoji,
Pleroma.Captcha,
Pleroma.FlakeId,
Pleroma.Emoji,
Pleroma.Captcha,
Pleroma.FlakeId,
- Pleroma.
ScheduledActivityWorker
,
- Pleroma.
ActivityExpirationWorker
+ Pleroma.
Daemons.ScheduledActivityDaemon
,
+ Pleroma.
Daemons.ActivityExpirationDaemon
] ++
cachex_children() ++
hackney_pool_children() ++
[
Pleroma.Stats,
] ++
cachex_children() ++
hackney_pool_children() ++
[
Pleroma.Stats,
- {Oban,
Application.get_env(:pleroma,
Oban)},
+ {Oban,
Pleroma.Config.get(
Oban)},
%{
id: :web_push_init,
start: {Task, :start_link, [&Pleroma.Web.Push.init/0]},
%{
id: :web_push_init,
start: {Task, :start_link, [&Pleroma.Web.Push.init/0]},