X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fapplication.ex;h=d0b9c3c41dad575d6fd33567b887cec9e01e8f76;hb=7d68924e4f7233590457aa7e32a21f082dd0584f;hp=df6d3a98d25743832a1fd4d1a5d04b19004e854e;hpb=13918cb545d583decfb728300850b307c59e2031;p=akkoma

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index df6d3a98d..d0b9c3c41 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Application do
@@ -42,6 +42,10 @@ defmodule Pleroma.Application do
     setup_instrumenters()
     load_custom_modules()
 
+    if adapter() == Tesla.Adapter.Gun do
+      Pleroma.OTPVersion.check!()
+    end
+
     # Define workers and child supervisors to be supervised
     children =
       [
@@ -66,18 +70,6 @@ defmodule Pleroma.Application do
           Pleroma.Gopher.Server
         ]
 
-    case Pleroma.OTPVersion.check_version() do
-      :ok -> :ok
-      {:error, version} -> raise "
-        !!!OTP VERSION WARNING!!!
-        You are using gun adapter with OTP version #{version}, which doesn't support correct handling of unordered certificates chains.
-        "
-      :undefined -> raise "
-        !!!OTP VERSION WARNING!!!
-        To support correct handling of unordered certificates chains - OTP version must be > 22.2.
-        "
-    end
-
     # See http://elixir-lang.org/docs/stable/elixir/Supervisor.html
     # for other strategies and supported options
     opts = [strategy: :one_for_one, name: Pleroma.Supervisor]
@@ -202,11 +194,7 @@ defmodule Pleroma.Application do
     [hackney_pool, Pleroma.Pool.Supervisor]
   end
 
-  defp http_pools_children(_) do
-    :tesla
-    |> Application.get_env(:adapter)
-    |> http_pools()
-  end
+  defp http_pools_children(_), do: http_pools(adapter())
 
   defp http_pools(Tesla.Adapter.Hackney) do
     pools = [:federation, :media]
@@ -227,4 +215,6 @@ defmodule Pleroma.Application do
   defp http_pools(Tesla.Adapter.Gun), do: [Pleroma.Pool.Supervisor]
 
   defp http_pools(_), do: []
+
+  defp adapter, do: Application.get_env(:tesla, :adapter)
 end