diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2021-09-21 20:01:19 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2021-09-21 20:01:19 +0300 |
| commit | 1c0904053386db3fc35c0e9a52d510d3896a1b48 (patch) | |
| tree | 661623f1d6c5246598445321e2ea3c68509f9172 | |
| parent | 7aedc45d1fe674e262fd6dda53c2530fe59be8cb (diff) | |
| download | rabbitmq-server-git-1c0904053386db3fc35c0e9a52d510d3896a1b48.tar.gz | |
Use rabbit_data_coercion functions here
| -rw-r--r-- | deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl b/deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl index 56805aee00..1febf9e5b8 100644 --- a/deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl +++ b/deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl @@ -11,7 +11,7 @@ -export([start_link/0, init/1, adjust/2, stop_child/1, cleanup_specs/0]). -import(rabbit_misc, [pget/2]). --import(proplists, [to_map/1, from_map/1]). +-import(rabbit_data_coercion, [to_map/1, to_list/1]). -include("rabbit_shovel.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). @@ -43,7 +43,7 @@ start_child({VHost, ShovelName} = Name, Def) -> rabbit_log_shovel:debug("Starting a mirrored supervisor named '~s' in virtual host '~s'", [ShovelName, VHost]), Result = case mirrored_supervisor:start_child( ?SUPERVISOR, - {Name, {rabbit_shovel_dyn_worker_sup, start_link, [Name, get_obfuscate_uris_parameters(Def)]}, + {Name, {rabbit_shovel_dyn_worker_sup, start_link, [Name, obfuscated_uris_parameters(Def)]}, transient, ?WORKER_WAIT, worker, [rabbit_shovel_dyn_worker_sup]}) of {ok, _Pid} -> ok; {error, {already_started, _Pid}} -> ok @@ -52,11 +52,10 @@ start_child({VHost, ShovelName} = Name, Def) -> rabbit_shovel_locks:unlock(LockId), Result. -get_obfuscate_uris_parameters(Def) -> - case Def of - M when is_map(M) -> to_map(rabbit_shovel_parameters:obfuscate_uris_parameters(from_map(Def))); - _ -> rabbit_shovel_parameters:obfuscate_uris_parameters(Def) - end. +obfuscated_uris_parameters(Def) when is_map(Def) -> + to_map(rabbit_shovel_parameters:obfuscate_uris_parameters(to_list(Def))); +obfuscated_uris_parameters(Def) when is_list(Def) -> + rabbit_shovel_parameters:obfuscate_uris_parameters(Def). child_exists(Name) -> lists:any(fun ({N, _, _, _}) -> N =:= Name end, |