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

Pass pid_file to reset_agent() so it can pass it to stop_agent().

Browse Source
This commit is contained in:
Daniel Nichter
2013-05-14 17:21:27 -07:00
parent c6c963f3ee
commit 3c70839c3a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/pt-agent
View File

@@ -4969,10 +4969,11 @@ sub main {
} }
} }
reset_agent( reset_agent(
api_key => $api_key, pid_file => $o->get('pid'), # for stop_agent()
lib_dir => $o->get('lib'), lib_dir => $o->get('lib'),
spool_dir => $o->get('spool'), spool_dir => $o->get('spool'),
log_file => $o->get('log'), log_file => $o->get('log'),
api_key => $api_key, # optional
); );
if ( $exit_status != 0 ) { if ( $exit_status != 0 ) {
_warn("Failed to completely reset pt-agent. Check the warnings " _warn("Failed to completely reset pt-agent. Check the warnings "
@@ -7071,10 +7072,12 @@ sub reset_agent {
my (%args) = @_; my (%args) = @_;
have_required_args(\%args, qw( have_required_args(\%args, qw(
pid_file
lib_dir lib_dir
spool_dir spool_dir
log_file log_file
)) or die; )) or die;
my $pid_file = $args{pid_file}; # for stop_agent()
my $lib_dir = $args{lib_dir}; my $lib_dir = $args{lib_dir};
my $spool_dir = $args{spool_dir}; my $spool_dir = $args{spool_dir};
my $log_file = $args{log_file}; my $log_file = $args{log_file};
@@ -7090,7 +7093,10 @@ sub reset_agent {
} }
_info('Stopping pt-agent...'); _info('Stopping pt-agent...');
my $stopped = stop_agent(%args); # set global $exit_status my $stopped = stop_agent(
pid_file => $pid_file,
lib_dir => $lib_dir,
);
if ( !$stopped ) { if ( !$stopped ) {
_warn('Failed to stop pt-agent. Stop the agent, or verify that ' _warn('Failed to stop pt-agent. Stop the agent, or verify that '
. 'it is no longer running, and try again.'); . 'it is no longer running, and try again.');