percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-27 07:54:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix reporting errors when stopping services.

Browse Source
This commit is contained in:
Daniel Nichter
2013-06-14 22:05:51 -07:00
parent 85bc902cc2
commit 29b1d20857
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bin/pt-agent
View File

@@ -7810,6 +7810,7 @@ sub stop_all_services {
foreach my $file ( glob "$lib_dir/services/stop-*" ) { foreach my $file ( glob "$lib_dir/services/stop-*" ) {
my $service = basename($file); my $service = basename($file);
my $stop_log = "$lib_dir/logs/$service.stop"; my $stop_log = "$lib_dir/logs/$service.stop";
my $run_log = "$lib_dir/logs/$service.run";
my $cmd = ($env_vars ? "$env_vars " : '') my $cmd = ($env_vars ? "$env_vars " : '')
. "${bin_dir}pt-agent --run-service $service" . "${bin_dir}pt-agent --run-service $service"
. " </dev/null" . " </dev/null"
@@ -7819,8 +7820,8 @@ sub stop_all_services {
system($cmd); system($cmd);
my $cmd_exit_status = $CHILD_ERROR >> 8; my $cmd_exit_status = $CHILD_ERROR >> 8;
if ( $cmd_exit_status != 0 ) { if ( $cmd_exit_status != 0 ) {
my $err = slurp($stop_log); my $err = -f $run_log ? slurp($run_log) : '';
$logger->warning("Error stopping $service: " . ($err || '')); $logger->error("Error stopping $service: " . ($err || '(No error logged)'));
next SERVICE; next SERVICE;
} }
unlink $stop_log unlink $stop_log