From a03cb8b89ea6d6536d55a1fd0f9b2902419304ac Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 15 May 2019 16:02:09 +0200 Subject: [PATCH] partially revert "api/nodes journal: add and enforce parameter conflicts" This partially reverts commit f9b08743a5a2322427ebdce78eb84c990bae7e31 as we had some wrong assumptions about lastentries and the other params, so just note conflicts in the description but let the tool itself make the checks This reverts commit f9b08743a5a2322427ebdce78eb84c990bae7e31. Signed-off-by: Thomas Lamprecht --- PVE/API2/Nodes.pm | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm index 1f81d74d..ee87ee38 100644 --- a/PVE/API2/Nodes.pm +++ b/PVE/API2/Nodes.pm @@ -725,7 +725,7 @@ __PACKAGE__->register_method({ optional => 1, }, lastentries => { - description => "Limit to the last X lines. Conflicts with any cursor or time range parameters.", + description => "Limit to the last X lines. Conflicts with a range.", type => 'integer', optional => 1, }, @@ -754,24 +754,11 @@ __PACKAGE__->register_method({ my $user = $rpcenv->get_user(); my $cmd = ["/usr/bin/mini-journalreader"]; - - my $add_to_cmd = sub { - my ($opt, $p, @conflicts) = @_; - return if !defined($param->{$p}); - - for my $c (@conflicts) { - die "parameters '$p' and '$c' conflict with each other!\n" - if defined($param->{$c}); - } - - push @$cmd, $opt, $param->{$p}; - }; - - $add_to_cmd->('-b', 'since', 'startcursor', 'lastentries'); - $add_to_cmd->('-e', 'until', 'endcursor', 'lastentries'); - $add_to_cmd->('-f', 'startcursor', 'lastentries'); - $add_to_cmd->('-t', 'endcursor', 'lastentries'); - $add_to_cmd->('-n', 'lastentries'); + push @$cmd, '-n', $param->{lastentries} if $param->{lastentries}; + push @$cmd, '-b', $param->{since} if $param->{since}; + push @$cmd, '-e', $param->{until} if $param->{until}; + push @$cmd, '-f', $param->{startcursor} if $param->{startcursor}; + push @$cmd, '-t', $param->{endcursor} if $param->{endcursor}; my $lines = []; my $parser = sub { push @$lines, shift };