X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fapplication.ex;h=bd568d8580c75539cc88354823cccbfcdc93b3b9;hb=e87cca97e62d8464c87c7335741f54c2299cc0d6;hp=769af1806cdfc0b7ae0a16caf3268cc58ebaf4cd;hpb=8d218ebaf5ab0b72e419068340c40a5ef9744924;p=akkoma

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 769af1806..bd568d858 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -110,7 +110,28 @@ defmodule Pleroma.Application do
     # 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)
+
+    set_postgres_server_version()
+
+    result
+  end
+
+  defp set_postgres_server_version do
+    version =
+      with %{rows: [[version]]} <- Ecto.Adapters.SQL.query!(Pleroma.Repo, "show server_version"),
+           {num, _} <- Float.parse(version) do
+        num
+      else
+        e ->
+          Logger.warn(
+            "Could not get the postgres version: #{inspect(e)}.\nSetting the default value of 9.6"
+          )
+
+          9.6
+      end
+
+    :persistent_term.put({Pleroma.Repo, :postgres_version}, version)
   end
 
   def load_custom_modules do
@@ -208,8 +229,7 @@ defmodule Pleroma.Application do
          name: Pleroma.Web.Streamer.registry(),
          keys: :duplicate,
          partitions: System.schedulers_online()
-       ]},
-      Pleroma.Web.FedSockets.Supervisor
+       ]}
     ]
   end
 
@@ -275,6 +295,7 @@ defmodule Pleroma.Application do
 
   defp http_children(_, _), do: []
 
+  @spec limiters_setup() :: :ok
   def limiters_setup do
     [Pleroma.Web.RichMedia.Helpers, Pleroma.Web.MediaProxy]
     |> Enum.each(&ConcurrentLimiter.new(&1, 1, 0))