X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fapplication.ex;h=79b9dee9d2412194f55dd50d5bb12182e953a338;hb=847cb15626debd15eb50c00bb50113457bed7d1c;hp=e5bd17ced4c96a8f71f00981f1bb0ddb2b6c83bb;hpb=03ddaead7e01d096cc3caa95a956d049be2e28f6;p=akkoma

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index e5bd17ced..79b9dee9d 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -14,15 +14,24 @@ defmodule Pleroma.Application do
       supervisor(Pleroma.Web.Endpoint, []),
       # Start your own worker by calling: Pleroma.Worker.start_link(arg1, arg2, arg3)
       # worker(Pleroma.Worker, [arg1, arg2, arg3]),
-      supervisor(ConCache, [[
-                             ttl_check: :timer.seconds(1),
-                             ttl: :timer.seconds(5)
-                           ], [name: :users]])
+      worker(Cachex, [:user_cache, [
+                         default_ttl: 25000,
+                         ttl_interval: 1000,
+                         limit: 2500
+                       ]]),
+      worker(Pleroma.Web.Federator, []),
+      worker(Pleroma.Stats, []),
     ]
+    ++ if Mix.env == :test, do: [], else: [worker(Pleroma.Web.Streamer, [])]
+    ++ if !chat_enabled(), do: [], else: [worker(Pleroma.Web.ChatChannel.ChatChannelState, [])]
 
     # See http://elixir-lang.org/docs/stable/elixir/Supervisor.html
     # for other strategies and supported options
     opts = [strategy: :one_for_one, name: Pleroma.Supervisor]
     Supervisor.start_link(children, opts)
   end
+
+  defp chat_enabled do
+    Application.get_env(:pleroma, :chat, []) |> Keyword.get(:enabled)
+  end
 end