From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Thu, 31 Jan 2019 08:07:49 +0000 (+0700)
Subject: Merge remote-tracking branch 'MAIN/develop' into feature/jobs
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d3677d2b4d4d53619777509e0169bb0764213d39;p=akkoma

Merge remote-tracking branch 'MAIN/develop' into feature/jobs
---

d3677d2b4d4d53619777509e0169bb0764213d39
diff --cc lib/pleroma/application.ex
index 60cba1580,40bff08c7..e81816e35
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@@ -99,13 -101,15 +101,16 @@@ defmodule Pleroma.Application d
            ],
            id: :cachex_idem
          ),
-         worker(Pleroma.FlakeId, []),
-         worker(Pleroma.Web.Federator.RetryQueue, []),
-         worker(Pleroma.Stats, []),
-         worker(Pleroma.Web.Push, []),
-         worker(Pleroma.Jobs, []),
-         worker(Task, [&Pleroma.Web.Federator.init/0], restart: :temporary)
+         worker(Pleroma.FlakeId, [])
        ] ++
+         hackney_pool_children() ++
+         [
+           worker(Pleroma.Web.Federator.RetryQueue, []),
 -          worker(Pleroma.Web.Federator, []),
+           worker(Pleroma.Stats, []),
 -          worker(Pleroma.Web.Push, [])
++          worker(Pleroma.Web.Push, []),
++          worker(Pleroma.Jobs, []),
++          worker(Task, [&Pleroma.Web.Federator.init/0], restart: :temporary)          
+         ] ++
          streamer_child() ++
          chat_child() ++
          [