X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fapplication.ex;h=eedad767507a6b48adc88f9f6c81b0d6ca9cab66;hb=a44d87f0594ad10809afe269e20e8d4c777b5d5c;hp=79b9dee9d2412194f55dd50d5bb12182e953a338;hpb=9cf293c84b68a5befa70f221fb49b4227e05dd51;p=akkoma

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 79b9dee9d..eedad7675 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -5,25 +5,70 @@ 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]),
-      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, [])]
+    children =
+      [
+        # Start the Ecto repository
+        supervisor(Pleroma.Repo, []),
+        worker(Pleroma.Emoji, []),
+        # 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
+            ]
+          ],
+          id: :cachex_user
+        ),
+        worker(
+          Cachex,
+          [
+            :object_cache,
+            [
+              default_ttl: 25000,
+              ttl_interval: 1000,
+              limit: 2500
+            ]
+          ],
+          id: :cachex_object
+        ),
+        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.Stats, []),
+        worker(Pleroma.Gopher.Server, [])
+      ] ++
+        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