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

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index e5bd17ced..89826f515 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -7,22 +7,43 @@ defmodule Pleroma.Application do
     import Supervisor.Spec
 
     # Define workers and child supervisors to be supervised
-    children = [
-      # Start the Ecto repository
-      supervisor(Pleroma.Repo, []),
-      # Start the endpoint when the application starts
-      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]])
-    ]
+    children =
+      [
+        # Start the Ecto repository
+        supervisor(Pleroma.Repo, []),
+        # Start the endpoint when the application starts
+        supervisor(Pleroma.Web.Endpoint, []),
+        # Start your own worker by calling: Pleroma.Worker.start_link(arg1, arg2, arg3)
+        # worker(Pleroma.Worker, [arg1, arg2, arg3]),
+        worker(Cachex, [
+          :user_cache,
+          [
+            default_ttl: 25000,
+            ttl_interval: 1000,
+            limit: 2500
+          ]
+        ]),
+        worker(Pleroma.Web.Federator, []),
+        worker(Pleroma.Gopher.Server, []),
+        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