percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 21:19:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't init the config file: this was really just overwriting it which caused problems for a manually set config when pt-agent couldn't get a config from PWS.

Browse Source
This commit is contained in:
Daniel Nichter
2013-04-10 17:44:10 -06:00
parent cb3952291a
commit e37e30dd01
1 changed files with 5 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
bin/pt-agent
View File

@@ -4900,15 +4900,15 @@ sub main {
# retried forever.
# ########################################################################
# Check and init the config file. This should probably never fail
# because the config file is $HOME/.pt-agent.conf, so the user should
# Check the config file. This should probably never fail because
# the config file is $HOME/.pt-agent.conf, so the user should
# be able to write to their home dir. --run-service and --send-data
# don't need to do this because if there's no valid config, they should
# fail; they'll probably die due to --lib missing, which they verify
# but don't create.
init_config_file(
api_key => $api_key,
);
my $config_file = get_config_file();
_err("$config_file exists but is not writable")
unless -f $config_file && -w $config_file;
# Wait time between checking for new config and services.
# Use the tool's built-in default until a config is gotten,
@@ -6532,31 +6532,6 @@ sub get_config_file {
return $config_file;
}
sub init_config_file {
my (%args) = @_;
have_required_args(\%args, qw(
api_key
)) or die;
my $api_key = $args{api_key};
my $config_file = get_config_file();
eval {
die "$config_file exists but is not writable\n"
if -f $config_file && !-w $config_file;
open my $fh, '>', $config_file
or die "Error opening $config_file: $OS_ERROR";
print { $fh } "api-key=$api_key\n"
or die "Error writing to $config_file: $OS_ERROR";
close $fh
or die "Error closing $config_file: $OS_ERROR";
};
if ( $EVAL_ERROR ) {
die "Error initializing $config_file: $EVAL_ERROR\n";
}
return;
}
sub save_agent {
my (%args) = @_;
have_required_args(\%args, qw(