logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 484ba5d062d93fd0cf4841e7743724928af5a2d9
parent 0edb5c805be97b42a68db1aa5f00c33483a0f035
Author: rinpatch <rin@patch.cx>
Date:   Tue, 23 Feb 2021 10:01:09 +0000

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

Diffstat:

Mlib/pleroma/application.ex4++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 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 ]