Skip to content

Fix rabbitmq-diagnostics remote_shell for 26.0 #7441

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 27, 2023
Merged

Fix rabbitmq-diagnostics remote_shell for 26.0 #7441

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
24 changes: 16 additions & 8 deletions deps/rabbitmq_cli/lib/rabbitmq/cli/diagnostics/commands/remote_shell_command.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,27 @@

defmodule RabbitMQ.CLI.Diagnostics.Commands.RemoteShellCommand do
@behaviour RabbitMQ.CLI.CommandBehaviour
@dialyzer :no_missing_calls

use RabbitMQ.CLI.Core.MergesNoDefaults
use RabbitMQ.CLI.Core.AcceptsNoPositionalArguments

def run([], %{node: node_name}) do
_ = Supervisor.terminate_child(:kernel_sup, :user)
Process.flag(:trap_exit, true)
user_drv = :user_drv.start(['tty_sl -c -e', {node_name, :shell, :start, []}])
Process.link(user_drv)

receive do
{'EXIT', _user_drv, _} ->
{:ok, "Disconnected from #{node_name}."}
_ = :c.l(:shell)

if :erlang.function_exported(:shell, :start_interactive, 1) do
:shell.start_interactive({node_name, :shell, :start, []})
:timer.sleep(:infinity)
else
_ = Supervisor.terminate_child(:kernel_sup, :user)
Process.flag(:trap_exit, true)
user_drv = :user_drv.start(['tty_sl -c -e', {node_name, :shell, :start, []}])
Process.link(user_drv)

receive do
{'EXIT', _user_drv, _} ->
{:ok, "Disconnected from #{node_name}."}
end
end
end

Expand Down