percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-12 14:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sandbox.pm: Catch errors from shelled-out commands

Browse Source
This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-06-11 11:50:52 -03:00
parent d46a89d810
commit 87f32cc857
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Sandbox.pm
View File

@@ -74,11 +74,9 @@ sub use {
return if !defined $cmd || !$cmd; return if !defined $cmd || !$cmd;
my $use = $self->_use_for($server) . " $cmd"; my $use = $self->_use_for($server) . " $cmd";
PTDEBUG && _d('"Executing', $use, 'on', $server); PTDEBUG && _d('"Executing', $use, 'on', $server);
eval { my $out = `$use 2>&1`;
`$use`; if ( $? >> 8 ) {
}; die "Failed to execute $cmd on $server: $out";
if ( $EVAL_ERROR ) {
die "Failed to execute $cmd on $server: $EVAL_ERROR";
} }
return; return;
} }
@@ -140,9 +138,9 @@ sub load_file {
my $use = $self->_use_for($server) . " $d < $file"; my $use = $self->_use_for($server) . " $d < $file";
PTDEBUG && _d('Loading', $file, 'on', $server, ':', $use); PTDEBUG && _d('Loading', $file, 'on', $server, ':', $use);
eval { `$use` }; my $out = `$use 2>&1`;
if ( $EVAL_ERROR ) { if ( $? >> 8 ) {
die "Failed to execute $file on $server: $EVAL_ERROR"; die "Failed to execute $file on $server: $out";
} }
$self->wait_for_slaves(); $self->wait_for_slaves();
} }