seasharp
/
anvil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(tools): remove all remote calls in manage vnc pipes

Browse Source
main
Tsu-ba-me 1 year ago committed by digimer
parent 6c776e5a6a
commit f2d3b06a10
1 changed files with 26 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 62
      tools/striker-manage-vnc-pipes

62
tools/striker-manage-vnc-pipes
Unescape View File

@ -21,40 +21,24 @@ my $anvil = Anvil::Tools->new();
sub call sub call
{ {
my $parameters = shift; my $parameters = shift;
my $host_name = $parameters->{host_name} // $anvil->data->{sys}{host_name}; my $call = $parameters->{call};
my $remote_user = $parameters->{remote_user}; my $debug = $parameters->{debug} // 3;
my $shell_call = $parameters->{shell_call};
$anvil->Log->variables({ source => $THIS_FILE, line => __LINE__, level => $debug, list => $parameters, prefix => "call" });
return (1) if ( (not defined $call) || ($call eq "") );
my $shell_output; my $shell_output;
my $shell_error;
my $shell_return_code; my $shell_return_code;
my $is_remote_call = is_remote_host_name($host_name); my ($output, $rcode) = $anvil->System->call({ shell_call => $call });
if ($is_remote_call) $anvil->Log->variables({ source => $THIS_FILE, line => __LINE__, level => $debug, list => {
{ output => $output,
($shell_output, $shell_error, $shell_return_code) = $anvil->Remote->call({ rcode => $rcode
target => $host_name,
remote_user => $remote_user,
shell_call => $shell_call
});
}
else
{
($shell_output, $shell_return_code) = $anvil->System->call({ shell_call => $shell_call });
}
$anvil->Log->variables({ source => $THIS_FILE, line => __LINE__, level => 2, list => {
host_name => $host_name,
is_remote_call => $is_remote_call,
remote_user => $remote_user,
shell_call => $shell_call,
shell_output => $shell_output,
shell_error => $shell_error,
shell_return_code => $shell_return_code
}, prefix => "call" }); }, prefix => "call" });
return ($shell_output, $shell_error, $shell_return_code); return ($rcode, $output);
} }
sub get_server_info sub get_server_info
@ -141,10 +125,10 @@ sub get_vnc_info
# Requires root to access VM information. # Requires root to access VM information.
my $shell_call = "virsh vncdisplay \"$server_name\""; my $shell_call = "virsh vncdisplay \"$server_name\"";
my ($shell_output, $shell_error, $shell_return_code) = call({ my ($shell_return_code, $shell_output) = call({
call => $shell_call,
host_name => $host_name, host_name => $host_name,
remote_user => "root", user => "root",
shell_call => $shell_call
}); });
return if ($shell_return_code != 0); return if ($shell_return_code != 0);
@ -183,7 +167,7 @@ sub get_available_port
my $shell_call = "ss_output=\$(ss --all --tcp --numeric) && port=".$start_port." && while egrep -q \":\${port}[[:space:]]+[^[:space:]]+\" <<<\$ss_output; do (( port ".$step_operator."= ".$step_size." )); done && echo \$port"; my $shell_call = "ss_output=\$(ss --all --tcp --numeric) && port=".$start_port." && while egrep -q \":\${port}[[:space:]]+[^[:space:]]+\" <<<\$ss_output; do (( port ".$step_operator."= ".$step_size." )); done && echo \$port";
my ($shell_output, $shell_error, $shell_return_code) = call({ host_name => $host_name, shell_call => $shell_call }); my ($shell_return_code, $shell_output) = call({ host_name => $host_name, call => $shell_call });
if ($shell_return_code == 0) if ($shell_return_code == 0)
{ {
@ -200,7 +184,7 @@ sub is_websockify_process
my $ws_pid = $parameters->{ws_pid}; my $ws_pid = $parameters->{ws_pid};
my $shell_call = "ps -e -o command -h -p ".$ws_pid; my $shell_call = "ps -e -o command -h -p ".$ws_pid;
my ($shell_output, $shell_error, $shell_return_code) = call({ host_name => $host_name, shell_call => $shell_call }); my ($shell_return_code, $shell_output) = call({ host_name => $host_name, call => $shell_call });
return $shell_output =~ /websockify/ ? 1 : 0; return $shell_output =~ /websockify/ ? 1 : 0;
} }
@ -213,7 +197,7 @@ sub is_ssh_process
my $shell_call = "ps -e -o command -h -p ".$ssh_tunnel_pid; my $shell_call = "ps -e -o command -h -p ".$ssh_tunnel_pid;
my ($shell_output) = call({ host_name => $host_name, shell_call => $shell_call }); my ($shell_return_code, $shell_output) = call({ host_name => $host_name, call => $shell_call });
return $shell_output =~ /striker-open-ssh-tunnel/ ? 1 : 0; return $shell_output =~ /striker-open-ssh-tunnel/ ? 1 : 0;
} }
@ -468,10 +452,10 @@ sub start_websockify
my $shell_call = "websockify ".$source_port." :".$target_port." &>/dev/null & echo pid:\$!"; my $shell_call = "websockify ".$source_port." :".$target_port." &>/dev/null & echo pid:\$!";
my ($shell_output, $shell_error, $shell_return_code) = call({ my ($shell_return_code, $shell_output) = call({
call => $shell_call,
host_name => $ws_host_name, host_name => $ws_host_name,
remote_user => "admin", user => "admin",
shell_call => $shell_call
}); });
return if ($shell_return_code != 0); return if ($shell_return_code != 0);
@ -505,7 +489,7 @@ sub stop_websockify
return if (not is_websockify_process($parameters)); return if (not is_websockify_process($parameters));
call({ host_name => $host_name, shell_call => "kill $ws_pid || kill -9 $ws_pid" }); call({ host_name => $host_name, call => "kill $ws_pid || kill -9 $ws_pid" });
} }
sub start_ssh_tunnel sub start_ssh_tunnel
@ -564,7 +548,7 @@ sub start_ssh_tunnel
." --forward-remote-port ".$ws_dest_port ." --forward-remote-port ".$ws_dest_port
." &>/dev/null & echo pid:\$!"; ." &>/dev/null & echo pid:\$!";
my ($shell_output, $shell_error, $shell_return_code) = call({ host_name => $host_name, shell_call => $shell_call }); my ($shell_return_code, $shell_output) = call({ host_name => $host_name, call => $shell_call });
if ($shell_return_code == 0) if ($shell_return_code == 0)
{ {
@ -598,7 +582,7 @@ sub stop_ssh_tunnel
return if (not is_ssh_process($parameters)); return if (not is_ssh_process($parameters));
call({ host_name => $host_name, shell_call => "kill $ssh_tunnel_pid || kill -9 $ssh_tunnel_pid" }); call({ host_name => $host_name, call => "kill $ssh_tunnel_pid || kill -9 $ssh_tunnel_pid" });
} }
sub create_vnc_pipes_table sub create_vnc_pipes_table

Write Preview
Loading…
Cancel
Save