From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C890E60E42 for ; Fri, 25 Sep 2020 16:13:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BC71F1C191 for ; Fri, 25 Sep 2020 16:13:30 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E91FB1C15A for ; Fri, 25 Sep 2020 16:13:28 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B501B456E6 for ; Fri, 25 Sep 2020 16:13:28 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 25 Sep 2020 16:13:17 +0200 Message-Id: <20200925141327.25024-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925141327.25024-1-d.csapak@proxmox.com> References: <20200925141327.25024-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.178 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [tasks.rs] Subject: [pbs-devel] [PATCH proxmox-backup 01/10] api2/node/tasks: move userfilter to function signature X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Sep 2020 14:13:30 -0000 Signed-off-by: Dominik Csapak --- src/api2/node/tasks.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api2/node/tasks.rs b/src/api2/node/tasks.rs index c8add6b4..e6a58a82 100644 --- a/src/api2/node/tasks.rs +++ b/src/api2/node/tasks.rs @@ -303,6 +303,7 @@ pub fn list_tasks( limit: u64, errors: bool, running: bool, + userfilter: Option, param: Value, mut rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { @@ -315,7 +316,6 @@ pub fn list_tasks( let store = param["store"].as_str(); - let userfilter = param["userfilter"].as_str(); let list = server::read_task_list()?; @@ -327,7 +327,7 @@ pub fn list_tasks( if !list_all && info.upid.userid != userid { continue; } - if let Some(userid) = userfilter { + if let Some(userid) = &userfilter { if !info.upid.userid.as_str().contains(userid) { continue; } } -- 2.20.1