Skip to content

Use friendly name for Ra logs #1866

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

Merged
merged 1 commit into from
Feb 5, 2019
Merged

Use friendly name for Ra logs #1866

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
2 changes: 1 addition & 1 deletion src/rabbit.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ start_loaded_apps(Apps, RestartTypes) ->
ensure_sysmon_handler_app_config(),
%% make Ra use a custom logger that dispatches to lager instead of the
%% default OTP logger
application:set_env(ra, logger_module, rabbit_ra_logger),
application:set_env(ra, logger_module, rabbit_log_ra_shim),
ConfigEntryDecoder = case application:get_env(rabbit, config_entry_decoder) of
undefined ->
[];
Expand Down
27 changes: 21 additions & 6 deletions src/rabbit_quorum_queue.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,21 +113,36 @@ declare(Q) when ?amqqueue_is_quorum(Q) ->
case rabbit_amqqueue:internal_declare(NewQ1, false) of
{created, NewQ} ->
RaMachine = ra_machine(NewQ),
case ra:start_cluster(RaName, RaMachine,
[{RaName, Node} || Node <- Nodes]) of
ServerIds = [{RaName, Node} || Node <- Nodes],
ClusterName = RaName,
RaConfs = [begin
UId = ra:new_uid(ra_lib:to_binary(ClusterName)),
FName = rabbit_misc:rs(QName),
#{cluster_name => ClusterName,
id => ServerId,
uid => UId,
friendly_name => FName,
initial_members => ServerIds,
log_init_args => #{uid => UId},
machine => RaMachine}
end || ServerId <- ServerIds],

case ra:start_cluster(RaConfs) of
{ok, _, _} ->
rabbit_event:notify(queue_created,
[{name, QName},
{durable, Durable},
{auto_delete, AutoDelete},
{arguments, Arguments},
{user_who_performed_action, ActingUser}]),
{user_who_performed_action,
ActingUser}]),
{new, NewQ};
{error, Error} ->
_ = rabbit_amqqueue:internal_delete(QName, ActingUser),
rabbit_misc:protocol_error(internal_error,
"Cannot declare a queue '~s' on node '~s': ~255p",
[rabbit_misc:rs(QName), node(), Error])
rabbit_misc:protocol_error(
internal_error,
"Cannot declare a queue '~s' on node '~s': ~255p",
[rabbit_misc:rs(QName), node(), Error])
end;
{existing, _} = Ex ->
Ex
Expand Down