From: lain <lain@soykaf.club>
Date: Tue, 1 Jan 2019 12:49:24 +0000 (+0100)
Subject: Remove default pool, it's used automatically anyway.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d4799e0dc23605563a29d14ad4657183174b55f9;p=akkoma

Remove default pool, it's used automatically anyway.
---

diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index 35c1490da..e2e92857f 100644
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@@ -8,7 +8,6 @@ defmodule Pleroma.HTTP.Connection do
   """
 
   @hackney_options [
-    pool: :default,
     timeout: 10000,
     recv_timeout: 20000,
     follow_redirect: true
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex
index 32d9cf5aa..0a46c11b5 100644
--- a/lib/pleroma/http/http.ex
+++ b/lib/pleroma/http/http.ex
@@ -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
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 167471b7b..c8c2905a7 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -741,8 +741,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
         {"Content-Type", "application/activity+json"},
         {"signature", signature},
         {"digest", digest}
-      ],
-      hackney: [pool: :default]
+      ]
     )
   end