135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#431 sshcollector calls die() even if all the work is not done - stromsoe

Browse Source
This commit is contained in:
Oliver Gorwits
2018-10-19 14:59:32 +01:00
parent d4b79f685b
commit 2818591462
8 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/netdisco-sshcollector
View File

@@ -257,7 +257,11 @@ Depending on the target system, it can be queried using simple methods like
or automated via Expect - this is mostly useful for non-Linux appliances which or automated via Expect - this is mostly useful for non-Linux appliances which
don't support command execution via ssh: don't support command execution via ssh:
my ($pty, $pid) = $ssh->open2pty or die "unable to run remote command"; my ($pty, $pid) = $ssh->open2pty;
unless ($pty) {
debug "unable to run remote command [$hostlabel] " . $ssh->error;
return ();
}
my $expect = Expect->init($pty); my $expect = Expect->init($pty);
my $prompt = qr/#/; my $prompt = qr/#/;
my ($pos, $error, $match, $before, $after) = $expect->expect(10, -re, $prompt); my ($pos, $error, $match, $before, $after) = $expect->expect(10, -re, $prompt);

6
lib/App/Netdisco/SSHCollector/Platform/ACE.pm
View File

@@ -47,7 +47,11 @@ sub arpnip{
debug "$hostlabel $$ arpnip()"; debug "$hostlabel $$ arpnip()";
my ($pty, $pid) = $ssh->open2pty or die "unable to run remote command"; my ($pty, $pid) = $ssh->open2pty;
unless ($pty) {
debug "unable to run remote command [$hostlabel] " . $ssh->error;
return ();
}
my $expect = Expect->init($pty); my $expect = Expect->init($pty);
my ($pos, $error, $match, $before, $after); my ($pos, $error, $match, $before, $after);

6
lib/App/Netdisco/SSHCollector/Platform/ASA.pm
View File

@@ -53,7 +53,11 @@ sub arpnip {
debug "$hostlabel $$ arpnip()"; debug "$hostlabel $$ arpnip()";
my ($pty, $pid) = $ssh->open2pty or die "unable to run remote command"; my ($pty, $pid) = $ssh->open2pty;
unless ($pty) {
debug "unable to run remote command [$hostlabel] " . $ssh->error;
return ();
}
my $expect = Expect->init($pty); my $expect = Expect->init($pty);
my ($pos, $error, $match, $before, $after); my ($pos, $error, $match, $before, $after);

6
lib/App/Netdisco/SSHCollector/Platform/CPVSX.pm
View File

@@ -50,7 +50,11 @@ sub arpnip {
debug "$hostlabel $$ arpnip()"; debug "$hostlabel $$ arpnip()";
my ($pty, $pid) = $ssh->open2pty or die "unable to run remote command"; my ($pty, $pid) = $ssh->open2pty;
unless ($pty) {
debug "unable to run remote command [$hostlabel] " . $ssh->error;
return ();
}
my $expect = Expect->init($pty); my $expect = Expect->init($pty);
my ($pos, $error, $match, $before, $after); my ($pos, $error, $match, $before, $after);

6
lib/App/Netdisco/SSHCollector/Platform/FreeBSD.pm
View File

@@ -48,7 +48,11 @@ sub arpnip {
debug "$hostlabel $$ arpnip()"; debug "$hostlabel $$ arpnip()";
my ($pty, $pid) = $ssh->open2pty or die "unable to run remote command"; my ($pty, $pid) = $ssh->open2pty;
unless ($pty) {
debug "unable to run remote command [$hostlabel] " . $ssh->error;
return ();
}
my $expect = Expect->init($pty); my $expect = Expect->init($pty);
my ($pos, $error, $match, $before, $after); my ($pos, $error, $match, $before, $after);

6
lib/App/Netdisco/SSHCollector/Platform/GAIAEmbedded.pm
View File

@@ -50,7 +50,11 @@ sub arpnip {
debug "$hostlabel $$ arpnip()"; debug "$hostlabel $$ arpnip()";
my ($pty, $pid) = $ssh->open2pty or die "unable to run remote command"; my ($pty, $pid) = $ssh->open2pty;
unless ($pty) {
debug "unable to run remote command [$hostlabel] " . $ssh->error;
return ();
}
my $expect = Expect->init($pty); my $expect = Expect->init($pty);
my ($pos, $error, $match, $before, $after); my ($pos, $error, $match, $before, $after);

6
lib/App/Netdisco/SSHCollector/Platform/Linux.pm
View File

@@ -48,7 +48,11 @@ sub arpnip {
debug "$hostlabel $$ arpnip()"; debug "$hostlabel $$ arpnip()";
my ($pty, $pid) = $ssh->open2pty or die "unable to run remote command"; my ($pty, $pid) = $ssh->open2pty;
unless ($pty) {
debug "unable to run remote command [$hostlabel] " . $ssh->error;
return ();
}
my $expect = Expect->init($pty); my $expect = Expect->init($pty);
my ($pos, $error, $match, $before, $after); my ($pos, $error, $match, $before, $after);

6
lib/App/Netdisco/SSHCollector/Platform/PaloAlto.pm
View File

@@ -39,7 +39,11 @@ sub arpnip{
debug "$hostlabel $$ arpnip()"; debug "$hostlabel $$ arpnip()";
my ($pty, $pid) = $ssh->open2pty or die "unable to run remote command"; my ($pty, $pid) = $ssh->open2pty;
unless ($pty) {
debug "unable to run remote command [$hostlabel] " . $ssh->error;
return ();
}
my $expect = Expect->init($pty); my $expect = Expect->init($pty);
my ($pos, $error, $match, $before, $after); my ($pos, $error, $match, $before, $after);
my $prompt = qr/> \r?$/; my $prompt = qr/> \r?$/;