Skip to content
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

Jump to bottom

fix: handle undefined when removing callbacks #47

Merged
merged 2 commits into from
Jan 9, 2024
Merged

fix: handle undefined when removing callbacks #47

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
add0c04
fix: handle `undefined` when removing callbacks
thalesmg Jan 9, 2024
e66ea5b
fix: normalize `on_{dis,re}connect` callbacks to lists
thalesmg Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 19 additions & 22 deletions src/ecpool_worker.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
id :: pos_integer(),
client :: pid() | {pid(), pid()} | undefined,
mod :: module(),
on_reconnect :: ecpool:conn_callback() | [ecpool:conn_callback()] | undefined,
on_disconnect :: ecpool:conn_callback() | [ecpool:conn_callback()] | undefined,
on_reconnect :: [ecpool:conn_callback()],
zmstone marked this conversation as resolved.
Show resolved Hide resolved
on_disconnect :: [ecpool:conn_callback()],
zmstone marked this conversation as resolved.
Show resolved Hide resolved
supervisees = [],
opts :: proplists:proplist()
}).
Expand Down Expand Up @@ -163,10 +163,10 @@ handle_cast({exec_async, Action, Callback}, State = #state{client = Client}) ->
{noreply, State};

handle_cast({set_reconn_callbk, OnReconnect}, State) ->
{noreply, State#state{on_reconnect = OnReconnect}};
{noreply, State#state{on_reconnect = ensure_callback(OnReconnect)}};

handle_cast({set_disconn_callbk, OnDisconnect}, State) ->
{noreply, State#state{on_disconnect = OnDisconnect}};
{noreply, State#state{on_disconnect = ensure_callback(OnDisconnect)}};

handle_cast({add_reconn_callbk, OnReconnect}, State = #state{on_reconnect = OldOnReconnect}) ->
{noreply, State#state{on_reconnect = add_conn_callback(OnReconnect, OldOnReconnect)}};
Expand Down Expand Up @@ -196,7 +196,7 @@ handle_info({'EXIT', Pid, Reason}, State = #state{opts = Opts, supervisees = Sup
handle_info(reconnect, State = #state{opts = Opts, on_reconnect = OnReconnect}) ->
case connect_internal(State) of
{ok, NewState = #state{client = Client}} ->
handle_reconnect(Client, OnReconnect),
_ = handle_reconnect(Client, OnReconnect),
{noreply, NewState};
{Err, _Reason} when Err =:= error orelse Err =:= 'EXIT' ->
reconnect(proplists:get_value(auto_reconnect, Opts), State)
Expand Down Expand Up @@ -249,21 +249,17 @@ reconnect(Secs, State = #state{client = Client, on_disconnect = Disconnect, supe
erlang:send_after(timer:seconds(Secs), self(), reconnect),
{noreply, State#state{client = undefined}}.

handle_reconnect(_, undefined) ->
ok;
handle_reconnect(undefined, _) ->
ok;
handle_reconnect(Client, OnReconnectList) when is_list(OnReconnectList) ->
[safe_exec(OnReconnect, Client) || OnReconnect <- OnReconnectList];
handle_reconnect(Client, OnReconnect) ->
safe_exec(OnReconnect, Client).
lists:foreach(fun(OnReconnectCallback) -> safe_exec(OnReconnectCallback, Client) end,
OnReconnectList).

handle_disconnect(undefined, _) ->
ok;
handle_disconnect(_, undefined) ->
ok;
handle_disconnect(Client, Disconnect) ->
safe_exec(Disconnect, Client).
handle_disconnect(Client, OnDisconnectList) ->
lists:foreach(fun(OnDisconnectCallback) -> safe_exec(OnDisconnectCallback, Client) end,
OnDisconnectList).

connect_internal(State) ->
try connect(State) of
Expand Down Expand Up @@ -293,17 +289,18 @@ safe_exec(Action, MainArg) when is_function(Action) ->
exec({M, F, A}, MainArg) ->
erlang:apply(M, F, [MainArg]++A).

ensure_callback(undefined) -> undefined;
ensure_callback({_,_,_} = Callback) -> Callback.
ensure_callback(undefined) ->
[];
ensure_callback({_,_,_} = Callback) ->
zmstone marked this conversation as resolved.
Show resolved Hide resolved
[Callback];
ensure_callback(Callbacks) when is_list(Callbacks) ->
%% assert
lists:map(fun({_, _, _} = Callback) -> Callback end, Callbacks).

add_conn_callback(OnReconnect, OldOnReconnects) when is_list(OldOnReconnects) ->
[OnReconnect | OldOnReconnects];
add_conn_callback(OnReconnect, undefined) ->
[OnReconnect];
add_conn_callback(OnReconnect, OldOnReconnect) ->
[OnReconnect, OldOnReconnect].
[OnReconnect | OldOnReconnects].

remove_conn_callback({Mod, Fn}, Callbacks) ->
remove_conn_callback({Mod, Fn}, Callbacks) when is_list(Callbacks) ->
lists:filter(fun({Mod0, Fn0, _Args}) -> {Mod0, Fn0} =/= {Mod, Fn} end, Callbacks).

erase_client(Pid, State = #state{client = Pid, supervisees = SupPids}) ->
Expand Down