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

Add __ENV__ to replace_special_vars().

Browse Source
This commit is contained in:
Daniel Nichter
2013-06-14 21:05:50 -07:00
parent 7d2d3bfbfc
commit 84cf7c00d0
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/pt-agent
View File

@@ -6913,6 +6913,7 @@ sub run_service {
my $tmp_data_file = "$tmp_dir/$data_file"; my $tmp_data_file = "$tmp_dir/$data_file";
my $taskno = 0; my $taskno = 0;
my $metadata = { data_ts => $prefix }; my $metadata = { data_ts => $prefix };
my $env_vars = env_vars();
TASK: TASK:
foreach my $task ( @$tasks ) { foreach my $task ( @$tasks ) {
@@ -6986,6 +6987,7 @@ sub run_service {
store => $store, # __STORE_key__ store => $store, # __STORE_key__
ts => $prefix, # __TS__ ts => $prefix, # __TS__
bin_dir => $bin_dir, # __BIN_DIR__ bin_dir => $bin_dir, # __BIN_DIR__
env => $env_vars, # __ENV__
); );
$logger->info("Task $taskno query: $query"); $logger->info("Task $taskno query: $query");
my $rows; my $rows;
@@ -7051,6 +7053,7 @@ sub run_service {
store => $store, # __STORE_key__ store => $store, # __STORE_key__
ts => $prefix, # __TS__ ts => $prefix, # __TS__
bin_dir => $bin_dir, # __BIN_DIR__ bin_dir => $bin_dir, # __BIN_DIR__
env => $env_vars, # __ENV__
); );
$logger->info("Task $taskno command: $cmd"); $logger->info("Task $taskno command: $cmd");
@@ -7189,6 +7192,9 @@ sub replace_special_vars {
my $ts = $args{ts}; my $ts = $args{ts};
my $bin_dir = $args{bin_dir}; my $bin_dir = $args{bin_dir};
# Optional args
my $env = $args{env} || '';
my $new_cmd = join(' ', my $new_cmd = join(' ',
map { map {
my $word = $_; my $word = $_;
@@ -7212,6 +7218,7 @@ sub replace_special_vars {
$word =~ s/__META__FILE__/$meta_dir\/$service/g; $word =~ s/__META__FILE__/$meta_dir\/$service/g;
$word =~ s/__BIN_DIR__/$bin_dir/g; $word =~ s/__BIN_DIR__/$bin_dir/g;
$word =~ s/__TRASH_FILE__/$spool_dir\/.trash\/$service/g; $word =~ s/__TRASH_FILE__/$spool_dir\/.trash\/$service/g;
$word =~ s/__ENV__/$env/g;
$word; $word;
} }