public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com, pmg-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pmg-api 3/3] PMG/API2/Tasks: add statusfilter
Date: Thu, 24 Jun 2021 09:10:16 +0200	[thread overview]
Message-ID: <20210624071016.21013-8-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210624071016.21013-1-d.csapak@proxmox.com>

like in PVE/PBS

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/PMG/API2/Tasks.pm | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/PMG/API2/Tasks.pm b/src/PMG/API2/Tasks.pm
index a369c2a..b3d4279 100644
--- a/src/PMG/API2/Tasks.pm
+++ b/src/PMG/API2/Tasks.pm
@@ -58,6 +58,12 @@ __PACKAGE__->register_method({
 		description => "Only list tasks until this UNIX epoch.",
 		optional => 1,
 	    },
+	    statusfilter => {
+		type => 'string',
+		format => 'pve-task-status-type-list',
+		optional => 1,
+		description => 'List of Task States that should be returned.',
+	    },
 	},
     },
     returns => {
@@ -88,6 +94,27 @@ __PACKAGE__->register_method({
 	my $until = $param->{until};
 	my $errors = $param->{errors};
 
+	my $statusfilter = {
+	    ok => 1,
+	    warning => 1,
+	    error => 1,
+	    unknown => 1,
+	};
+
+	if (defined($param->{statusfilter}) && !$errors) {
+	    $statusfilter = {
+		ok => 0,
+		warning => 0,
+		error => 0,
+		unknown => 0,
+	    };
+	    for my $filter (PVE::Tools::split_list($param->{statusfilter})) {
+		$statusfilter->{lc($filter)} = 1 ;
+	    }
+	} elsif ($errors) {
+	    $statusfilter->{ok} = 0;
+	}
+
 	my $count = 0;
 	my $line;
 
@@ -98,11 +125,13 @@ __PACKAGE__->register_method({
 		my $status = $5;
 		if ((my $task = PVE::Tools::upid_decode($upid, 1))) {
 		    return if $userfilter && $task->{user} !~ m/\Q$userfilter\E/i;
-		    return if $errors && $status && $status eq 'OK';
 		    return if defined($since) && $task->{starttime} < $since;
 		    return if defined($until) && $task->{starttime} > $until;
 		    return if $typefilter && $task->{type} ne $typefilter;
 
+		    my $statustype = PVE::Tools::upid_get_status_type($status);
+		    return if !$statusfilter->{$statustype};
+
 		    return if $count++ < $start;
 		    return if $limit <= 0;
 
-- 
2.20.1





  parent reply	other threads:[~2021-06-24  7:10 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-24  7:10 [pve-devel] [PATCH common/pve-manager/pmg-api] unify task filter api Dominik Csapak
2021-06-24  7:10 ` [pve-devel] [PATCH common 1/2] PVE/JSONSchema: add pve-task-status-type Dominik Csapak
2021-06-28 12:59   ` [pve-devel] applied: [pmg-devel] " Thomas Lamprecht
2021-06-24  7:10 ` [pve-devel] [PATCH common 2/2] PVE/Tools: add 'upid_get_status_type' Dominik Csapak
2021-06-28 13:06   ` [pve-devel] applied: [pmg-devel] " Thomas Lamprecht
2021-06-24  7:10 ` [pve-devel] [PATCH manager 1/2] PVE/API2/Tasks: add since/until filter for the task list Dominik Csapak
2021-06-28 15:53   ` [pve-devel] applied: [pmg-devel] " Thomas Lamprecht
2021-06-24  7:10 ` [pve-devel] [PATCH manager 2/2] PVE/API2/Tasks: add statusfilter to " Dominik Csapak
2021-06-28 15:53   ` [pve-devel] applied: [pmg-devel] " Thomas Lamprecht
2021-06-24  7:10 ` [pve-devel] [PATCH pmg-api 1/3] PMG/API2/Tasks: add typefilter Dominik Csapak
2021-06-24  7:10 ` [pve-devel] [PATCH pmg-api 2/3] PMG/API2/Tasks: add since and until filter Dominik Csapak
2021-06-24  7:10 ` Dominik Csapak [this message]
2021-06-28 14:55 ` [pve-devel] partially-applied: [pmg-devel] [PATCH common/pve-manager/pmg-api] unify task filter api Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210624071016.21013-8-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pmg-devel@lists.proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal