root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #13485 from cloudamqp/no_obs_cli_in_cli 

Minor improvement: Remove observer_cli from CLI escritps
This commit is contained in:
Michael Klishin 2025-03-12 15:18:13 -04:00 committed by GitHub
parent ea5345e045 f9d3ed732b
commit 69bd5ef0e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rabbitmq_cli/Makefile vendored
View File

@ -1,7 +1,7 @@
PROJECT = rabbitmq_cli PROJECT = rabbitmq_cli
BUILD_DEPS = rabbit_common BUILD_DEPS = rabbit_common
DEPS = csv json observer_cli stdout_formatter DEPS = csv json stdout_formatter
TEST_DEPS = amqp amqp_client temp x509 rabbit TEST_DEPS = amqp amqp_client temp x509 rabbit
dep_amqp = hex 3.3.0 dep_amqp = hex 3.3.0

6
deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/observer_command.ex vendored
View File

@ -19,11 +19,7 @@ defmodule RabbitMQ.CLI.Diagnostics.Commands.ObserverCommand do
@dialyzer {:nowarn_function, run: 2} @dialyzer {:nowarn_function, run: 2}
def run([], %{node: node_name, interval: interval}) do def run([], %{node: node_name, interval: interval}) do
case :observer_cli.start(node_name, [{:interval, interval * 1000}]) do case :rabbit_misc.rpc_call(node_name, :observer_cli, :start, [interval * 1000], :infinity) do
# See zhongwencool/observer_cli#54
{:badrpc, _} = err -> err
{:error, _} = err -> err
{:error, _, _} = err -> err
:ok -> {:ok, "Disconnected from #{node_name}."} :ok -> {:ok, "Disconnected from #{node_name}."}
:quit -> {:ok, "Disconnected from #{node_name}."} :quit -> {:ok, "Disconnected from #{node_name}."}
other -> other other -> other

6
deps/rabbitmq_cli/mix.exs vendored
View File

@ -29,7 +29,6 @@ defmodule RabbitMQCtl.MixfileBase do
JSON, JSON,
:mnesia, :mnesia,
:msacc, :msacc,
:observer_cli,
:public_key, :public_key,
:pubkey_cert, :pubkey_cert,
:rabbit, :rabbit,
@ -157,11 +156,6 @@ defmodule RabbitMQCtl.MixfileBase do
path: Path.join(deps_dir, "stdout_formatter"), path: Path.join(deps_dir, "stdout_formatter"),
compile: if(is_bazel, do: fake_cmd, else: make_cmd) 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, :rabbit_common,
path: Path.join(deps_dir, "rabbit_common"), path: Path.join(deps_dir, "rabbit_common"),