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

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index e5bd17ced..565e938fd 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -5,24 +5,62 @@ defmodule Pleroma.Application do
   # for more information on OTP Applications
   def start(_type, _args) do
     import Supervisor.Spec
+    import Cachex.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(
+          Cachex,
+          [
+            :idempotency_cache,
+            [
+              expiration:
+                expiration(
+                  default: :timer.seconds(6 * 60 * 60),
+                  interval: :timer.seconds(60)
+                ),
+              limit: 2500
+            ]
+          ],
+          id: :cachex_idem
+        ),
+        worker(Pleroma.Web.Federator, []),
+        worker(Pleroma.Gopher.Server, []),
+        worker(Pleroma.Stats, []),
+        worker(Pleroma.Web.Push, [])
+      ] ++
+        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