Merge branch 'postgresetup' into 'develop'

[akkoma] / lib / pleroma / application.ex

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 6267d0695b59ce9b5b59ed5941f09c7addf2fa82..2969ca3c48c29403366635f790d56ff101db952d 100644 (file)
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -18,8 +18,11 @@ defmodule Pleroma.Application do
                          default_ttl: 25000,
                          ttl_interval: 1000,
                          limit: 2500
-                       ]])
+                       ]]),
+      worker(Pleroma.Web.Federator, []),
+      worker(Pleroma.Web.ChatChannel.ChatChannelState, []),
     ]
+    ++ if Mix.env == :test, do: [], else: [worker(Pleroma.Web.Streamer, [])]
 
     # See http://elixir-lang.org/docs/stable/elixir/Supervisor.html
     # for other strategies and supported options