From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 4/6] api2/status: remove list_task api call
Date: Fri, 30 Oct 2020 15:02:13 +0100 [thread overview]
Message-ID: <20201030140215.13329-6-d.csapak@proxmox.com> (raw)
In-Reply-To: <20201030140215.13329-1-d.csapak@proxmox.com>
we do not need it anymore, we can do everything with nodes/NODE/tasks
instead
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/api2/status.rs | 99 ----------------------------------------------
1 file changed, 99 deletions(-)
diff --git a/src/api2/status.rs b/src/api2/status.rs
index 02ba1a78..582d7f0f 100644
--- a/src/api2/status.rs
+++ b/src/api2/status.rs
@@ -17,17 +17,13 @@ use crate::api2::types::{
RRDMode,
RRDTimeFrameResolution,
Authid,
- TaskListItem,
- TaskStateType,
};
-use crate::server;
use crate::backup::{DataStore};
use crate::config::datastore;
use crate::tools::statistics::{linear_regression};
use crate::config::cached_user_info::CachedUserInfo;
use crate::config::acl::{
- PRIV_SYS_AUDIT,
PRIV_DATASTORE_AUDIT,
PRIV_DATASTORE_BACKUP,
};
@@ -179,103 +175,8 @@ fn datastore_status(
Ok(list.into())
}
-#[api(
- input: {
- properties: {
- since: {
- type: i64,
- description: "Only list tasks since this UNIX epoch.",
- optional: true,
- },
- typefilter: {
- optional: true,
- type: String,
- description: "Only list tasks, whose type contains this string.",
- },
- statusfilter: {
- optional: true,
- type: Array,
- description: "Only list tasks which have any one of the listed status.",
- items: {
- type: TaskStateType,
- },
- },
- },
- },
- returns: {
- description: "A list of tasks.",
- type: Array,
- items: { type: TaskListItem },
- },
- access: {
- description: "Users can only see there own tasks, unless the have Sys.Audit on /system/tasks.",
- permission: &Permission::Anybody,
- },
-)]
-/// List tasks.
-pub fn list_tasks(
- since: Option<i64>,
- typefilter: Option<String>,
- statusfilter: Option<Vec<TaskStateType>>,
- _param: Value,
- rpcenv: &mut dyn RpcEnvironment,
-) -> Result<Vec<TaskListItem>, Error> {
-
- let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
- let user_info = CachedUserInfo::new()?;
- let user_privs = user_info.lookup_privs(&auth_id, &["system", "tasks"]);
-
- let list_all = (user_privs & PRIV_SYS_AUDIT) != 0;
- let since = since.unwrap_or_else(|| 0);
-
- let list: Vec<TaskListItem> = server::TaskListInfoIterator::new(false)?
- .take_while(|info| {
- match info {
- Ok(info) => info.upid.starttime > since,
- Err(_) => false
- }
- })
- .filter_map(|info| {
- match info {
- Ok(info) => {
- if list_all || info.upid.auth_id == auth_id {
- if let Some(filter) = &typefilter {
- if !info.upid.worker_type.contains(filter) {
- return None;
- }
- }
-
- if let Some(filters) = &statusfilter {
- if let Some(state) = &info.state {
- let statetype = match state {
- server::TaskState::OK { .. } => TaskStateType::OK,
- server::TaskState::Unknown { .. } => TaskStateType::Unknown,
- server::TaskState::Error { .. } => TaskStateType::Error,
- server::TaskState::Warning { .. } => TaskStateType::Warning,
- };
-
- if !filters.contains(&statetype) {
- return None;
- }
- }
- }
-
- Some(Ok(TaskListItem::from(info)))
- } else {
- None
- }
- }
- Err(err) => Some(Err(err))
- }
- })
- .collect::<Result<Vec<TaskListItem>, Error>>()?;
-
- Ok(list.into())
-}
-
const SUBDIRS: SubdirMap = &[
("datastore-usage", &Router::new().get(&API_METHOD_DATASTORE_STATUS)),
- ("tasks", &Router::new().get(&API_METHOD_LIST_TASKS)),
];
pub const ROUTER: Router = Router::new()
--
2.20.1
next prev parent reply other threads:[~2020-10-30 14:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-30 14:02 [pbs-devel] [PATCH widget-toolkit/proxmox-backup] improve Administration/Task panel Dominik Csapak
2020-10-30 14:02 ` [pbs-devel] [PATCH widget-toolkit 1/1] add form/TaskTypeSelector Dominik Csapak
2020-10-30 17:19 ` [pbs-devel] applied: " Thomas Lamprecht
2020-10-30 14:02 ` [pbs-devel] [PATCH proxmox-backup 1/6] server/worker_task: add tasktype to return the api type of a taskstate Dominik Csapak
2020-10-30 14:02 ` [pbs-devel] [PATCH proxmox-backup 2/6] api2/node/tasks: change limit behaviour when it is 0 Dominik Csapak
2020-10-30 14:02 ` [pbs-devel] [PATCH proxmox-backup 3/6] api2/node/tasks: add optional since/typefilter/statusfilter Dominik Csapak
2020-10-30 14:02 ` Dominik Csapak [this message]
2020-10-30 14:02 ` [pbs-devel] [PATCH proxmox-backup 5/6] api2/node/tasks: add optional until filter Dominik Csapak
2020-10-30 14:02 ` [pbs-devel] [PATCH proxmox-backup 6/6] ui: add panel/Tasks and use it for the node tasks Dominik Csapak
2020-11-03 13:52 ` [pbs-devel] applied-series: [PATCH widget-toolkit/proxmox-backup] improve Administration/Task panel 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=20201030140215.13329-6-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.