X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fapplication.ex;h=2969ca3c48c29403366635f790d56ff101db952d;hb=69f1024bb0c6fef509cb38aabcbb1482055cde05;hp=e5bd17ced4c96a8f71f00981f1bb0ddb2b6c83bb;hpb=82914e1e4de37747653c83644b428c1ba29428c9;p=akkoma

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index e5bd17ced..2969ca3c4 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -14,11 +14,15 @@ 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.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