Remove default pool, it's used automatically anyway.
authorlain <lain@soykaf.club>
Tue, 1 Jan 2019 12:49:24 +0000 (13:49 +0100)
committerlain <lain@soykaf.club>
Tue, 1 Jan 2019 12:49:24 +0000 (13:49 +0100)
lib/pleroma/http/connection.ex
lib/pleroma/http/http.ex
lib/pleroma/web/activity_pub/activity_pub.ex

index 35c1490da22813356d6ffc5a7086a79de9f04f24..e2e92857f21fc5ea6be32e9a9e668a919ad98a39 100644 (file)
@@ -8,7 +8,6 @@ defmodule Pleroma.HTTP.Connection do
   """
 
   @hackney_options [
-    pool: :default,
     timeout: 10000,
     recv_timeout: 20000,
     follow_redirect: true
index 32d9cf5aa7806efdcc50b08f40cb164bb6f17e18..0a46c11b561beecd054a530114af86a5803c5813 100644 (file)
@@ -56,7 +56,6 @@ defmodule Pleroma.HTTP do
   def process_request_options(options) do
     config = Application.get_env(:pleroma, :http, [])
     proxy = Keyword.get(config, :proxy_url, nil)
-    options = options ++ [adapter: [pool: :default]]
 
     case proxy do
       nil -> options
index 167471b7bde1ee4deb3e26021dda553abc4bd6c2..c8c2905a7d5468ea2031ace7ea707a3c9c96ca4d 100644 (file)
@@ -741,8 +741,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
         {"Content-Type", "application/activity+json"},
         {"signature", signature},
         {"digest", digest}
-      ],
-      hackney: [pool: :default]
+      ]
     )
   end