X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fapplication.ex;h=00b06f723ab224bc5e86a8cf46f4ae546bb72c4e;hb=83a3de8cc4edc6992bbc334cda57de13caa971b0;hp=76df3945e59482b85e9d627169582ad9c5cdfd13;hpb=f4e2595592ccca6cedd64669baef7bdd2a6547d0;p=akkoma

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 76df3945e..00b06f723 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -4,7 +4,6 @@
 
 defmodule Pleroma.Application do
   use Application
-  import Supervisor.Spec
 
   @name Mix.Project.config()[:name]
   @version Mix.Project.config()[:version]
@@ -31,102 +30,141 @@ defmodule Pleroma.Application do
     children =
       [
         # Start the Ecto repository
-        supervisor(Pleroma.Repo, []),
-        worker(Pleroma.Emoji, []),
-        worker(Pleroma.Captcha, []),
-        worker(
-          Cachex,
-          [
-            :used_captcha_cache,
-            [
-              ttl_interval: :timer.seconds(Pleroma.Config.get!([Pleroma.Captcha, :seconds_valid]))
-            ]
-          ],
-          id: :cachex_used_captcha_cache
-        ),
-        worker(
-          Cachex,
-          [
-            :user_cache,
-            [
-              default_ttl: 25_000,
-              ttl_interval: 1000,
-              limit: 2500
-            ]
-          ],
-          id: :cachex_user
-        ),
-        worker(
-          Cachex,
-          [
-            :object_cache,
-            [
-              default_ttl: 25_000,
-              ttl_interval: 1000,
-              limit: 2500
-            ]
-          ],
-          id: :cachex_object
-        ),
-        worker(
-          Cachex,
-          [
-            :rich_media_cache,
-            [
-              default_ttl: :timer.minutes(120),
-              limit: 5000
-            ]
-          ],
-          id: :cachex_rich_media
-        ),
-        worker(
-          Cachex,
-          [
-            :scrubber_cache,
-            [
-              limit: 2500
-            ]
-          ],
-          id: :cachex_scrubber
-        ),
-        worker(
-          Cachex,
-          [
-            :idempotency_cache,
-            [
-              expiration:
-                expiration(
-                  default: :timer.seconds(6 * 60 * 60),
-                  interval: :timer.seconds(60)
-                ),
-              limit: 2500
-            ]
-          ],
-          id: :cachex_idem
-        ),
-        worker(Pleroma.FlakeId, []),
-        worker(Pleroma.ScheduledActivityWorker, [])
+        %{id: Pleroma.Repo, start: {Pleroma.Repo, :start_link, []}, type: :supervisor},
+        %{id: Pleroma.Config.TransferTask, start: {Pleroma.Config.TransferTask, :start_link, []}},
+        %{id: Pleroma.Emoji, start: {Pleroma.Emoji, :start_link, []}},
+        %{id: Pleroma.Captcha, start: {Pleroma.Captcha, :start_link, []}},
+        %{
+          id: :cachex_used_captcha_cache,
+          start:
+            {Cachex, :start_link,
+             [
+               :used_captcha_cache,
+               [
+                 ttl_interval:
+                   :timer.seconds(Pleroma.Config.get!([Pleroma.Captcha, :seconds_valid]))
+               ]
+             ]}
+        },
+        %{
+          id: :cachex_user,
+          start:
+            {Cachex, :start_link,
+             [
+               :user_cache,
+               [
+                 default_ttl: 25_000,
+                 ttl_interval: 1000,
+                 limit: 2500
+               ]
+             ]}
+        },
+        %{
+          id: :cachex_object,
+          start:
+            {Cachex, :start_link,
+             [
+               :object_cache,
+               [
+                 default_ttl: 25_000,
+                 ttl_interval: 1000,
+                 limit: 2500
+               ]
+             ]}
+        },
+        %{
+          id: :cachex_rich_media,
+          start:
+            {Cachex, :start_link,
+             [
+               :rich_media_cache,
+               [
+                 default_ttl: :timer.minutes(120),
+                 limit: 5000
+               ]
+             ]}
+        },
+        %{
+          id: :cachex_scrubber,
+          start:
+            {Cachex, :start_link,
+             [
+               :scrubber_cache,
+               [
+                 limit: 2500
+               ]
+             ]}
+        },
+        %{
+          id: :cachex_idem,
+          start:
+            {Cachex, :start_link,
+             [
+               :idempotency_cache,
+               [
+                 expiration:
+                   expiration(
+                     default: :timer.seconds(6 * 60 * 60),
+                     interval: :timer.seconds(60)
+                   ),
+                 limit: 2500
+               ]
+             ]}
+        },
+        %{id: Pleroma.FlakeId, start: {Pleroma.FlakeId, :start_link, []}},
+        %{
+          id: Pleroma.ScheduledActivityWorker,
+          start: {Pleroma.ScheduledActivityWorker, :start_link, []}
+        }
       ] ++
         hackney_pool_children() ++
         [
-          worker(Pleroma.Web.Federator.RetryQueue, []),
-          worker(Pleroma.Web.OAuth.Token.CleanWorker, []),
-          worker(Pleroma.Stats, []),
-          worker(Task, [&Pleroma.Web.Push.init/0], restart: :temporary, id: :web_push_init),
-          worker(Task, [&Pleroma.Web.Federator.init/0], restart: :temporary, id: :federator_init)
+          %{
+            id: Pleroma.Web.Federator.RetryQueue,
+            start: {Pleroma.Web.Federator.RetryQueue, :start_link, []}
+          },
+          %{
+            id: Pleroma.Web.OAuth.Token.CleanWorker,
+            start: {Pleroma.Web.OAuth.Token.CleanWorker, :start_link, []}
+          },
+          %{
+            id: Pleroma.Stats,
+            start: {Pleroma.Stats, :start_link, []}
+          },
+          %{
+            id: :web_push_init,
+            start: {Task, :start_link, [&Pleroma.Web.Push.init/0]},
+            restart: :temporary
+          },
+          %{
+            id: :federator_init,
+            start: {Task, :start_link, [&Pleroma.Web.Federator.init/0]},
+            restart: :temporary
+          },
+          %{
+            id: :internal_fetch_init,
+            start: {Task, :start_link, [&Pleroma.Web.ActivityPub.InternalFetchActor.init/0]},
+            restart: :temporary
+          }
         ] ++
         streamer_child() ++
         chat_child() ++
         [
           # Start the endpoint when the application starts
-          supervisor(Pleroma.Web.Endpoint, []),
-          worker(Pleroma.Gopher.Server, [])
+          %{
+            id: Pleroma.Web.Endpoint,
+            start: {Pleroma.Web.Endpoint, :start_link, []},
+            type: :supervisor
+          },
+          %{id: Pleroma.Gopher.Server, start: {Pleroma.Gopher.Server, :start_link, []}}
         ]
 
     # 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)
+    result = Supervisor.start_link(children, opts)
+    :ok = after_supervisor_start()
+    result
   end
 
   defp setup_instrumenters do
@@ -144,7 +182,6 @@ defmodule Pleroma.Application do
       Pleroma.Repo.Instrumenter.setup()
     end
 
-    Prometheus.Registry.register_collector(:prometheus_process_collector)
     Pleroma.Web.Endpoint.MetricsExporter.setup()
     Pleroma.Web.Endpoint.PipelineInstrumenter.setup()
     Pleroma.Web.Endpoint.Instrumenter.setup()
@@ -157,24 +194,29 @@ defmodule Pleroma.Application do
       else
         []
       end ++
-      if Pleroma.Config.get([Pleroma.Uploader, :proxy_remote]) do
+      if Pleroma.Config.get([Pleroma.Upload, :proxy_remote]) do
         [:upload]
       else
         []
       end
   end
 
-  if Mix.env() == :test do
+  if Pleroma.Config.get(:env) == :test do
     defp streamer_child, do: []
     defp chat_child, do: []
   else
     defp streamer_child do
-      [worker(Pleroma.Web.Streamer, [])]
+      [%{id: Pleroma.Web.Streamer, start: {Pleroma.Web.Streamer, :start_link, []}}]
     end
 
     defp chat_child do
       if Pleroma.Config.get([:chat, :enabled]) do
-        [worker(Pleroma.Web.ChatChannel.ChatChannelState, [])]
+        [
+          %{
+            id: Pleroma.Web.ChatChannel.ChatChannelState,
+            start: {Pleroma.Web.ChatChannel.ChatChannelState, :start_link, []}
+          }
+        ]
       else
         []
       end
@@ -187,4 +229,17 @@ defmodule Pleroma.Application do
       :hackney_pool.child_spec(pool, options)
     end
   end
+
+  defp after_supervisor_start do
+    with digest_config <- Application.get_env(:pleroma, :email_notifications)[:digest],
+         true <- digest_config[:active] do
+      PleromaJobQueue.schedule(
+        digest_config[:schedule],
+        :digest_emails,
+        Pleroma.DigestEmailWorker
+      )
+    end
+
+    :ok
+  end
 end