summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rin@patch.cx>2021-02-23 10:01:09 +0000
committerrinpatch <rin@patch.cx>2021-02-23 10:01:09 +0000
commit484ba5d062d93fd0cf4841e7743724928af5a2d9 (patch)
tree4484acf4f9e2b389dc9f4fb16b6da52e556d4cb1
parent0edb5c805be97b42a68db1aa5f00c33483a0f035 (diff)
parent0ef783baa1d82c57a47569e494e1d5010cd3dd91 (diff)
Merge branch '2534-pleroma-endpoint-earlier-init' into 'develop'
[#2534] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer) Closes #2534 See merge request pleroma/pleroma!3338
-rw-r--r--lib/pleroma/application.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 375507de1..c853a2bb4 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -97,13 +97,13 @@ defmodule Pleroma.Application do
Pleroma.Stats,
Pleroma.JobQueueMonitor,
{Majic.Pool, [name: Pleroma.MajicPool, pool_size: Config.get([:majic_pool, :size], 2)]},
- {Oban, Config.get(Oban)}
+ {Oban, Config.get(Oban)},
+ Pleroma.Web.Endpoint
] ++
task_children(@mix_env) ++
dont_run_in_test(@mix_env) ++
chat_child(chat_enabled?()) ++
[
- Pleroma.Web.Endpoint,
Pleroma.Gopher.Server
]