Skip to content

Minor improvement: Remove observer_cli from CLI escritps (backport #13485) (backport #13503) #13508

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
Mar 12, 2025
Merged

Minor improvement: Remove observer_cli from CLI escritps (backport #13485) (backport #13503) #13508

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 deps/rabbitmq_cli/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PROJECT = rabbitmq_cli

BUILD_DEPS = rabbit_common
DEPS = csv json observer_cli stdout_formatter
DEPS = csv json stdout_formatter
TEST_DEPS = amqp amqp_client temp x509 rabbit

dep_amqp = hex 3.3.0
Expand Down
6 changes: 1 addition & 5 deletions deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/observer_command.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ defmodule RabbitMQ.CLI.Diagnostics.Commands.ObserverCommand do

@dialyzer {:nowarn_function, run: 2}
def run([], %{node: node_name, interval: interval}) do
case :observer_cli.start(node_name, [{:interval, interval * 1000}]) do
# See zhongwencool/observer_cli#54
{:badrpc, _} = err -> err
{:error, _} = err -> err
{:error, _, _} = err -> err
case :rabbit_misc.rpc_call(node_name, :observer_cli, :start, [interval * 1000], :infinity) do
:ok -> {:ok, "Disconnected from #{node_name}."}
:quit -> {:ok, "Disconnected from #{node_name}."}
other -> other
Expand Down
6 changes: 0 additions & 6 deletions deps/rabbitmq_cli/mix.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ defmodule RabbitMQCtl.MixfileBase do
JSON,
:mnesia,
:msacc,
:observer_cli,
:public_key,
:pubkey_cert,
:rabbit,
Expand Down Expand Up @@ -157,11 +156,6 @@ defmodule RabbitMQCtl.MixfileBase do
path: Path.join(deps_dir, "stdout_formatter"),
compile: if(is_bazel, do: fake_cmd, else: make_cmd)
},
{
:observer_cli,
path: Path.join(deps_dir, "observer_cli"),
compile: if(is_bazel, do: fake_cmd, else: make_cmd)
},
{
:rabbit_common,
path: Path.join(deps_dir, "rabbit_common"),
Expand Down