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

fix(cgi-bin): revise is process checks to match tunnel script

Browse Source
main
Tsu-ba-me 3 years ago
parent d5724c1457
commit fa15c715e4
1 changed files with 4 additions and 4 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. 8
      cgi-bin/manage_vnc_pipes

8
cgi-bin/manage_vnc_pipes
Unescape View File

@ -106,7 +106,7 @@ sub is_websockify_process
my $parameters = shift; my $parameters = shift;
my $host_name = $parameters->{host_name}; my $host_name = $parameters->{host_name};
my $ws_pid = $parameters->{ws_pid}; my $ws_pid = $parameters->{ws_pid};
my $shell_call = "ps -o comm -h -p ".$ws_pid; my $shell_call = "ps -e -o command -h -p ".$ws_pid;
my ($shell_output, $shell_error, $shell_return_code) = $anvil->Remote->call({ my ($shell_output, $shell_error, $shell_return_code) = $anvil->Remote->call({
target => $host_name, target => $host_name,
@ -121,14 +121,14 @@ sub is_websockify_process
shell_return_code => $shell_return_code shell_return_code => $shell_return_code
} }); } });
return $shell_output eq "websockify" ? 1 : 0; return $shell_output =~ /websockify/ ? 1 : 0;
} }
sub is_ssh_process sub is_ssh_process
{ {
my $parameters = shift; my $parameters = shift;
my $ssh_tunnel_pid = $parameters->{ssh_tunnel_pid}; my $ssh_tunnel_pid = $parameters->{ssh_tunnel_pid};
my $shell_call = "ps -o comm -h -p ".$ssh_tunnel_pid; my $shell_call = "ps -e -o command -h -p ".$ssh_tunnel_pid;
my ($shell_output, $shell_return_code) = $anvil->System->call({ shell_call => $shell_call }); my ($shell_output, $shell_return_code) = $anvil->System->call({ shell_call => $shell_call });
$anvil->Log->variables({ source => $THIS_FILE, line => __LINE__, level => 2, list => { $anvil->Log->variables({ source => $THIS_FILE, line => __LINE__, level => 2, list => {
@ -137,7 +137,7 @@ sub is_ssh_process
shell_return_code => $shell_return_code shell_return_code => $shell_return_code
} }); } });
return $shell_output eq "ssh" ? 1 : 0; return $shell_output =~ /striker-open-ssh-tunnel/ ? 1 : 0;
} }
sub is_websockify_exists sub is_websockify_exists

Write Preview
Loading…
Cancel
Save