Skip to content

Fix connections leaking for all request types #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix connections leaking for all request types #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 33 additions & 5 deletions lib/webdavex/client.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,17 @@ defmodule Webdavex.Client do
{:ok, <<binary content>>}
"""
def get(%Config{} = config, path) do
with {:ok, 200, _, ref} <- request(:get, path, [], "", config),
{:ok, body} <- :hackney.body(ref) do
{:ok, body}
else
case request(:get, path, [], "", config) do
{:ok, 200, _, ref} ->
case :hackney.body(ref) do
{:ok, body} -> {:ok, body}
error -> wrap_error(error)
end

{:ok, _status, _headers, ref} = error ->
:ok = :hackney.skip_body(ref)
wrap_error(error)

error ->
wrap_error(error)
end
Expand All @@ -84,6 +91,10 @@ defmodule Webdavex.Client do
{:ok, 200, _headers, ref} ->
{:ok, Webdavex.Helpers.Hackney.stream_body(ref)}

{:ok, _status, _headers, ref} = error ->
:ok = :hackney.skip_body(ref)
wrap_error(error)

error ->
wrap_error(error)
end
Expand Down Expand Up @@ -159,6 +170,10 @@ defmodule Webdavex.Client do
{:ok, 204, _, _ref} ->
{:ok, :moved}

{:ok, _status, _headers, ref} = error ->
:ok = :hackney.skip_body(ref)
wrap_error(error)

error ->
wrap_error(error)
end
Expand All @@ -182,6 +197,10 @@ defmodule Webdavex.Client do
{:ok, 204, _, _ref} ->
{:ok, :copied}

{:ok, _status, _headers, ref} = error ->
:ok = :hackney.skip_body(ref)
wrap_error(error)

error ->
wrap_error(error)
end
Expand All @@ -199,9 +218,14 @@ defmodule Webdavex.Client do
"""
def delete(%Config{} = config, path) do
case request(:delete, path, [], "", config) do
{:ok, 204, _, _} ->
{:ok, 204, _headers, ref} ->
:ok = :hackney.skip_body(ref)
{:ok, :deleted}

{:ok, _status, _headers, ref} = error ->
:ok = :hackney.skip_body(ref)
wrap_error(error)

error ->
wrap_error(error)
end
Expand All @@ -225,6 +249,10 @@ defmodule Webdavex.Client do
{:ok, 201, _, _} ->
{:ok, :created}

{:ok, _status, _headers, ref} = error ->
:ok = :hackney.skip_body(ref)
wrap_error(error)

error ->
wrap_error(error)
end
Expand Down
96 changes: 96 additions & 0 deletions test/webdavex_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,18 @@ defmodule WebdavexTest do
assert {:ok, headers} = Klient.head("images/img.png")
assert {"Foo-Bar", "baz"} == Enum.find(headers, fn {k, _v} -> k == "Foo-Bar" end)
end

test "does not leak connections", %{bypass: bypass} do
Bypass.expect(bypass, "HEAD", "/dav/images/img.png", fn conn ->
Conn.resp(conn, Enum.random([201, 204, 500, 502, 404]), "")
end)

for _ <- 1..30 do
Klient.head("images/img.png")
end

assert :hackney_pool.get_stats(:default)[:in_use_count] == 0
end
end

describe "get/1" do
Expand All @@ -156,6 +168,18 @@ defmodule WebdavexTest do
assert {:ok, content} = Klient.get("images/img.png")
assert content == @image_content
end

test "does not leak connections", %{bypass: bypass} do
Bypass.expect(bypass, "GET", "/dav/images/img.png", fn conn ->
Conn.resp(conn, Enum.random([201, 204, 500, 502, 404]), "")
end)

for _ <- 1..30 do
Klient.get("images/img.png")
end

assert :hackney_pool.get_stats(:default)[:in_use_count] == 0
end
end

describe "get_stream/1" do
Expand All @@ -176,6 +200,18 @@ defmodule WebdavexTest do

assert @image_content == File.read!(tempfile)
end

test "does not leak connections", %{bypass: bypass} do
Bypass.expect(bypass, "GET", "/dav/images/img.png", fn conn ->
Conn.resp(conn, Enum.random([204, 500, 502, 404]), "")
end)

for _ <- 1..30 do
Klient.get_stream("images/img.png")
end

assert :hackney_pool.get_stats(:default)[:in_use_count] == 0
end
end

describe "copy/2" do
Expand Down Expand Up @@ -206,6 +242,18 @@ defmodule WebdavexTest do

assert {:ok, :copied} == Klient.copy("images/img.png", "images/img_copy.png", false)
end

test "does not leak connections", %{bypass: bypass} do
Bypass.expect(bypass, fn conn ->
Conn.resp(conn, Enum.random([500, 502, 404]), "")
end)

for _ <- 1..30 do
Klient.copy("images/img.png", "images/img_copy.png")
end

assert :hackney_pool.get_stats(:default)[:in_use_count] == 0
end
end

describe "move/2" do
Expand Down Expand Up @@ -236,6 +284,18 @@ defmodule WebdavexTest do

assert {:ok, :moved} == Klient.move("images/img.png", "images/img_copy.png", false)
end

test "does not leak connections", %{bypass: bypass} do
Bypass.expect(bypass, fn conn ->
Conn.resp(conn, Enum.random([500, 502, 404]), "")
end)

for _ <- 1..30 do
Klient.move("images/img.png", "images/img_copy.png")
end

assert :hackney_pool.get_stats(:default)[:in_use_count] == 0
end
end

describe "delete/1" do
Expand All @@ -247,6 +307,18 @@ defmodule WebdavexTest do

assert {:ok, :deleted} = Klient.delete("images/img.png")
end

test "does not leak connections", %{bypass: bypass} do
Bypass.expect(bypass, "DELETE", "/dav/images/img.png", fn conn ->
Conn.resp(conn, Enum.random([204, 500, 502, 404]), "")
end)

for _ <- 1..30 do
Klient.delete("images/img.png")
end

assert :hackney_pool.get_stats(:default)[:in_use_count] == 0
end
end

describe "mkcol_recursive/1" do
Expand Down Expand Up @@ -298,6 +370,18 @@ defmodule WebdavexTest do
assert {:ok, "/images/foo/bar"} == Klient.mkcol_recursive("images/foo/bar/")
assert RequestsTracer.requests(tracer_pid) == []
end

test "does not leak connections", %{bypass: bypass} do
Bypass.expect(bypass, fn conn ->
Conn.resp(conn, Enum.random([500, 502, 404]), "")
end)

for _ <- 1..30 do
Klient.mkcol_recursive("images/foo/bar/")
end

assert :hackney_pool.get_stats(:default)[:in_use_count] == 0
end
end

describe "mkcol/1" do
Expand All @@ -312,5 +396,17 @@ defmodule WebdavexTest do

assert {:ok, :created} == Klient.mkcol("images")
end

test "does not leak connections", %{bypass: bypass} do
Bypass.expect(bypass, fn conn ->
Conn.resp(conn, Enum.random([500, 502, 404]), "")
end)

for _ <- 1..30 do
Klient.mkcol("images")
end

assert :hackney_pool.get_stats(:default)[:in_use_count] == 0
end
end
end