starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-08-21 16:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve job queue counter clarity

Browse Source
This commit is contained in:
Ruben Fiszel
2023-08-27 23:11:04 +02:00
parent 724340baae
commit 3701e43fc6
3 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/.sqlx/query-c4fb68ce79c1cec23cadc515285578ca18398504cf703091d06191ff68d95399.json → backend/.sqlx/query-9da1bf41c433c1f781bcc8ea5d86fd796b7ff92434f5ed4682c4445a02c2c720.json
Generated
+2 -2
View File
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
"query": "SELECT coalesce(COUNT(*), 0) as \"database_length!\" FROM queue WHERE workspace_id = $1",
"query": "SELECT coalesce(COUNT(*), 0) as \"database_length!\" FROM queue WHERE workspace_id = $1 AND scheduled_for <= now() AND running = false",
"describe": {
"columns": [
{
@@ -18,5 +18,5 @@
null
]
},
"hash": "c4fb68ce79c1cec23cadc515285578ca18398504cf703091d06191ff68d95399"
"hash": "9da1bf41c433c1f781bcc8ea5d86fd796b7ff92434f5ed4682c4445a02c2c720"
}
backend/windmill-api/src/jobs.rs
+1 -21
View File
@@ -673,26 +673,6 @@ async fn cancel_all(
Ok(Json(uuids))
}
// #[derive(Serialize, Debug, FromRow)]
// struct QueueStats {
// database_length: i64,
// }
// async fn count_waiting_for_executors(
// Extension(db): Extension<DB>,
// Path(w_id): Path<String>,
// ) -> error::JsonResult<QueueStats> {
// Ok(Json(
// sqlx::query_as!(
// QueueStats,
// "SELECT coalesce(COUNT(*), 0) as \"database_length!\" FROM queue WHERE workspace_id = $1",
// w_id
// )
// .fetch_one(&db)
// .await?,
// ))
// }
#[derive(Serialize, Debug, FromRow)]
struct QueueStats {
database_length: i64,
@@ -705,7 +685,7 @@ async fn count_queue_jobs(
Ok(Json(
sqlx::query_as!(
QueueStats,
"SELECT coalesce(COUNT(*), 0) as \"database_length!\" FROM queue WHERE workspace_id = $1",
"SELECT coalesce(COUNT(*), 0) as \"database_length!\" FROM queue WHERE workspace_id = $1 AND scheduled_for <= now() AND running = false",
w_id
)
.fetch_one(&db)
frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte
+1 -1
View File
@@ -377,7 +377,7 @@
<div class="flex flex-col gap-1 md:flex-row w-full p-4">
<div class="flex gap-2 grow mb-2">
<div class="flex gap-1 relative max-w-36 min-w-[50px]">
<div class="text-xs absolute -top-4 truncate">Jobs Running or Queued</div>
<div class="text-xs absolute -top-4 truncate">Jobs Waiting for Worker</div>
<div class="mt-1">{queue_count ? ($queue_count ?? 0).toFixed(0) : '...'}</div>
</div>
<div class="flex"