X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fapplication.ex;h=c8a0617a5a318044e7d18c37c1255464bf0e078d;hb=6b2fb9160cd945cdd4b1265c793d1f85d559fccb;hp=df6d3a98d25743832a1fd4d1a5d04b19004e854e;hpb=d9e4b77f8be8249b428a7ef1448c9a2161dee88a;p=akkoma
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index df6d3a98d..c8a0617a5 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
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Application do
@@ -42,6 +42,28 @@ defmodule Pleroma.Application do
setup_instrumenters()
load_custom_modules()
+ if adapter() == Tesla.Adapter.Gun do
+ if version = Pleroma.OTPVersion.version() do
+ [major, minor] =
+ version
+ |> String.split(".")
+ |> Enum.map(&String.to_integer/1)
+ |> Enum.take(2)
+
+ if (major == 22 and minor < 2) or major < 22 do
+ raise "
+ !!!OTP VERSION WARNING!!!
+ You are using gun adapter with OTP version #{version}, which doesn't support correct handling of unordered certificates chains.
+ "
+ end
+ else
+ raise "
+ !!!OTP VERSION WARNING!!!
+ To support correct handling of unordered certificates chains - OTP version must be > 22.2.
+ "
+ end
+ end
+
# Define workers and child supervisors to be supervised
children =
[
@@ -66,18 +88,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 +212,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 +233,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