RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2024-12-11 09:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

marsadm: decompose eval_macro

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2017-12-12 23:12:09 +01:00 committed by Thomas Schoebel-Theuer
parent 0b6cb6ca06
commit 9a488fd1e4
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
userspace/marsadm
View File

@ -4196,7 +4196,7 @@ sub parse_macro {
return $result . $text;
}
sub eval_macro {
sub make_env {
my ($cmd, $res, $text) = (shift, shift, shift);
$text =~ s{$match_comment}{}sg;
my %start_env =
@ -4206,6 +4206,7 @@ sub eval_macro {
"resdir" => "$mars/resource-$res",
"mars" => $mars,
"host" => $host,
"real_host" => $real_host,
"ip" => $ip,
"timeout" => $timeout,
"threshold" => $threshold,
@ -4222,7 +4223,12 @@ sub eval_macro {
"__last__" => 0,
);
set_args(\%start_env, \%start_env, $cmd, @_);
return parse_macro($text, \%start_env);
return ($text, \%start_env);
}
sub eval_macro {
my ($text, $start_env) = make_env(@_);
return parse_macro($text, $start_env);
}
##################################################################