Skip to content

Stop Bypass.Instance correctly in dispatch_awaiting_callers/1 #141

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 2 commits into
base: master
Choose a base branch
from
Open

Stop Bypass.Instance correctly in dispatch_awaiting_callers/1 #141

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17e5a28
Stop `Bypass.Instance` correctly in `dispatch_awaiting_callers/1`
c-brenn Mar 11, 2024
8db6a5b
fixup! Stop `Bypass.Instance` correctly in `dispatch_awaiting_callers/1`
c-brenn Apr 26, 2024
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
53 changes: 28 additions & 25 deletions lib/bypass/instance.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,17 @@ defmodule Bypass.Instance do

{route, state} ->
result = {:exit, {:exit, reason, []}}
{:noreply, route |> put_result(ref, result, state) |> dispatch_awaiting_callers()}

route
|> put_result(ref, result, state)
|> dispatch_awaiting_callers()
end
end

def handle_cast({:put_expect_result, route, ref, result}, state) do
{:noreply, route |> put_result(ref, result, state) |> dispatch_awaiting_callers()}
route
|> put_result(ref, result, state)
|> dispatch_awaiting_callers()
end

def handle_call(request, from, state) do
Expand Down Expand Up @@ -363,34 +368,32 @@ defmodule Bypass.Instance do
{ref, put_in(state.monitors[ref], route)}
end

defp dispatch_awaiting_callers(
%{
callers_awaiting_down: down_callers,
callers_awaiting_exit: exit_callers,
socket: socket,
ref: ref
} = state
) do
defp dispatch_awaiting_callers(state) do
if retained_plugs_count(state) == 0 do
down_reset =
if length(down_callers) > 0 do
do_down(ref, socket)
Enum.each(down_callers, &GenServer.reply(&1, :ok))
%{state | socket: nil, callers_awaiting_down: []}
end

if length(exit_callers) > 0 do
{result, _updated_state} = do_exit(state)
Enum.each(exit_callers, &GenServer.reply(&1, result))
GenServer.stop(:normal)
end

down_reset || state
else
state
|> handle_callers_awaiting_down()
|> handle_callers_awaiting_exit()
else
{:noreply, state}
end
end

defp handle_callers_awaiting_down(%{callers_awaiting_down: []} = state), do: state

defp handle_callers_awaiting_down(%{callers_awaiting_down: down_callers} = state) do
do_down(state.ref, state.socket)
Enum.each(down_callers, &GenServer.reply(&1, :ok))
%{state | socket: nil, callers_awaiting_down: []}
end

defp handle_callers_awaiting_exit(%{callers_awaiting_exit: []} = state), do: {:noreply, state}

defp handle_callers_awaiting_exit(%{callers_awaiting_exit: exit_callers} = state) do
{result, updated_state} = do_exit(state)
Enum.each(exit_callers, &GenServer.reply(&1, result))
{:stop, :normal, updated_state}
end

defp retained_plugs_count(state) do
state.expectations
|> Map.values()
Expand Down