Skip to content

Add CQ and QQ Observer CLI plugins from boot steps (backport #13930) #13936

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

Closed
wants to merge 1 commit into from
Closed

Add CQ and QQ Observer CLI plugins from boot steps (backport #13930) #13936

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
16 changes: 16 additions & 0 deletions deps/rabbit/src/rabbit_observer_cli.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,23 @@
-export([init/0]).

init() ->
<<<<<<< HEAD
application:set_env(observer_cli, plugins, [
rabbit_observer_cli_classic_queues:plugin_info(),
rabbit_observer_cli_quorum_queues:plugin_info()
]).
=======
%% prepare observer_cli.plugins for add_plugin/1
application:set_env(observer_cli, plugins, application:get_env(observer_cli, plugins, [])).

%% must be executed after observer_cli boot_step
add_plugin(PluginInfo) ->
case application:get_env(observer_cli, plugins, undefined) of
undefined -> %% shouldn't be there, die
exit({rabbit_observer_cli_step_not_there, "Can't add observer_cli plugin, required boot_step wasn't executed"});
Plugins when is_list(Plugins) ->
application:set_env(observer_cli, plugins, Plugins ++ [PluginInfo]);
_ ->
exit({rabbit_observer_cli_plugins_error, "Can't add observer_cli plugin, existing entry is not a list"})
end.
>>>>>>> 2d029649a (Add CQ and QQ Observer CLI plugins from boot steps)
11 changes: 10 additions & 1 deletion deps/rabbit/src/rabbit_observer_cli_classic_queues.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,20 @@

-module(rabbit_observer_cli_classic_queues).

-export([plugin_info/0]).
-export([add_plugin/0, plugin_info/0]).
-export([attributes/1, sheet_header/0, sheet_body/1]).

-include_lib("rabbit_common/include/rabbit.hrl").

-rabbit_boot_step({?MODULE,
[{description, "Classic queues observer_cli plugin"},
{mfa, {?MODULE, add_plugin, []}},
{requires, [rabbit_observer_cli]},
{enables, routing_ready}]}).

add_plugin() ->
rabbit_observer_cli:add_plugin(plugin_info()).

plugin_info() ->
#{
module => rabbit_observer_cli_classic_queues,
Expand Down
11 changes: 10 additions & 1 deletion deps/rabbit/src/rabbit_observer_cli_quorum_queues.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,20 @@

-module(rabbit_observer_cli_quorum_queues).

-export([plugin_info/0]).
-export([add_plugin/0, plugin_info/0]).
-export([attributes/1, sheet_header/0, sheet_body/1]).

-include_lib("rabbit_common/include/rabbit.hrl").

-rabbit_boot_step({?MODULE,
[{description, "Quorum queues observer_cli plugin"},
{mfa, {?MODULE, add_plugin, []}},
{requires, [rabbit_observer_cli]},
{enables, routing_ready}]}).

add_plugin() ->
rabbit_observer_cli:add_plugin(plugin_info()).

plugin_info() ->
#{
module => rabbit_observer_cli_quorum_queues,
Expand Down
Loading