GlueOps/autoglue
1
0
Fork 0
mirror of https://github.com/GlueOps/autoglue.git synced 2026-02-13 12:50:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: jobs api

Browse Source
This commit is contained in:
allanice001
2025-09-23 13:40:20 +01:00
parent a59550bd96
commit 4d4fda17ca
3 changed files with 65 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
internal/handlers/jobs/jobs.go
View File

@@ -17,15 +17,20 @@ import (
) )
type JobListItem struct { type JobListItem struct {
ID string `json:"id"` ID string `json:"id"`
QueueName string `json:"queue_name"` QueueName string `json:"queue_name"`
Status string `json:"status"` Status string `json:"status"`
RetryCount int `json:"retry_count"` RetryCount int `json:"retry_count"`
MaxRetry int `json:"max_retry"` MaxRetry int `json:"max_retry"`
ScheduledAt time.Time `json:"scheduled_at"` ScheduledAt time.Time `json:"scheduled_at"`
StartedAt *time.Time `json:"started_at,omitempty"` StartedAt *time.Time `json:"started_at,omitempty"`
UpdatedAt time.Time `json:"updated_at"` UpdatedAt time.Time `json:"updated_at"`
LastError *string `json:"last_error,omitempty"` LastError *string `json:"last_error,omitempty"`
ResultStatus string `json:"result_status"`
Processed int `json:"processed"`
Ready int `json:"ready"`
Failed int `json:"failed"`
ElapsedMs int `json:"elapsed_ms"`
} }
type EnqueueReq struct { type EnqueueReq struct {
@@ -127,7 +132,14 @@ func GetActive(w http.ResponseWriter, r *http.Request) {
var rows []JobListItem var rows []JobListItem
err := db.DB.Model(&models.Job{}). err := db.DB.Model(&models.Job{}).
Select("id, queue_name, status, retry_count, max_retry, scheduled_at, started_at, updated_at, last_error"). Select(`
id, queue_name, status, retry_count, max_retry, scheduled_at, started_at, updated_at, last_error,
COALESCE(result->>'status','') AS result_status,
COALESCE((result->>'processed')::int, 0) AS processed,
COALESCE((result->>'ready')::int, 0) AS ready,
COALESCE((result->>'failed')::int, 0) AS failed,
COALESCE((result->>'elapsed_ms')::int, 0) AS elapsed_ms
`).
Where("status = ?", "running"). Where("status = ?", "running").
Order("started_at DESC NULLS LAST, updated_at DESC"). Order("started_at DESC NULLS LAST, updated_at DESC").
Limit(limit). Limit(limit).
@@ -160,7 +172,14 @@ func GetFailures(w http.ResponseWriter, r *http.Request) {
var rows []JobListItem var rows []JobListItem
err := db.DB.Model(&models.Job{}). err := db.DB.Model(&models.Job{}).
Select("id, queue_name, status, retry_count, max_retry, scheduled_at, started_at, updated_at, last_error"). Select(`
id, queue_name, status, retry_count, max_retry, scheduled_at, started_at, updated_at, last_error,
COALESCE(result->>'status','') AS result_status,
COALESCE((result->>'processed')::int, 0) AS processed,
COALESCE((result->>'ready')::int, 0) AS ready,
COALESCE((result->>'failed')::int, 0) AS failed,
COALESCE((result->>'elapsed_ms')::int, 0) AS elapsed_ms
`).
Where("status = ?", "failed"). Where("status = ?", "failed").
Order("updated_at DESC"). Order("updated_at DESC").
Limit(limit). Limit(limit).

20
internal/handlers/jobs/kpi.go
View File

@@ -21,12 +21,14 @@ func LoadKPI(db *gorm.DB) (KPI, error) {
now := time.Now() now := time.Now()
dayAgo := now.Add(-24 * time.Hour) dayAgo := now.Add(-24 * time.Hour)
// Running now
if err := db.Model(&models.Job{}). if err := db.Model(&models.Job{}).
Where("status = ?", "running"). Where("status = ?", "running").
Count(&k.RunningNow).Error; err != nil { Count(&k.RunningNow).Error; err != nil {
return k, err return k, err
} }
// Scheduled in the future
if err := db.Model(&models.Job{}). if err := db.Model(&models.Job{}).
Where("status IN ?", []string{"queued", "scheduled", "pending"}). Where("status IN ?", []string{"queued", "scheduled", "pending"}).
Where("scheduled_at > ?", now). Where("scheduled_at > ?", now).
@@ -34,6 +36,7 @@ func LoadKPI(db *gorm.DB) (KPI, error) {
return k, err return k, err
} }
// Due now (queued/scheduled/pending with scheduled_at <= now)
if err := db.Model(&models.Job{}). if err := db.Model(&models.Job{}).
Where("status IN ?", []string{"queued", "scheduled", "pending"}). Where("status IN ?", []string{"queued", "scheduled", "pending"}).
Where("scheduled_at <= ?", now). Where("scheduled_at <= ?", now).
@@ -41,22 +44,25 @@ func LoadKPI(db *gorm.DB) (KPI, error) {
return k, err return k, err
} }
// Sum of 'ready' over successful jobs in last 24h
if err := db.Model(&models.Job{}). if err := db.Model(&models.Job{}).
Where("status = ?", "success"). Select("COALESCE(SUM((result->>'ready')::int), 0)").
Where("updated_at >= ?", dayAgo). Where("status = 'success' AND updated_at >= ?", dayAgo).
Count(&k.Succeeded24h).Error; err != nil { Scan(&k.Succeeded24h).Error; err != nil {
return k, err return k, err
} }
// Sum of 'failed' over successful jobs in last 24h (failures within a “success” run)
if err := db.Model(&models.Job{}). if err := db.Model(&models.Job{}).
Where("status = ?", "failed"). Select("COALESCE(SUM((result->>'failed')::int), 0)").
Where("updated_at >= ?", dayAgo). Where("status = 'success' AND updated_at >= ?", dayAgo).
Count(&k.Failed24h).Error; err != nil { Scan(&k.Failed24h).Error; err != nil {
return k, err return k, err
} }
// Retryable failed job rows (same as before)
if err := db.Model(&models.Job{}). if err := db.Model(&models.Job{}).
Where("status = ?", "failed"). Where("status = 'failed'").
Where("retry_count < max_retry"). Where("retry_count < max_retry").
Count(&k.Retryable).Error; err != nil { Count(&k.Retryable).Error; err != nil {
return k, err return k, err

27
internal/handlers/jobs/queue.go
View File

@@ -31,11 +31,28 @@ func LoadPerQueue(db *gorm.DB) ([]QueueRollup, error) {
var rr, qd, qf, s24, f24 int64 var rr, qd, qf, s24, f24 int64
var avgDur *float64 var avgDur *float64
_ = db.Model(&models.Job{}).Where("queue_name = ? AND status = 'running'", q).Count(&rr).Error _ = db.Model(&models.Job{}).
_ = db.Model(&models.Job{}).Where("queue_name = ? AND status IN ('queued','scheduled','pending') AND scheduled_at <= ?", q, now).Count(&qd).Error Where("queue_name = ? AND status = 'running'", q).
_ = db.Model(&models.Job{}).Where("queue_name = ? AND status IN ('queued','scheduled','pending') AND scheduled_at > ?", q, now).Count(&qf).Error Count(&rr).Error
_ = db.Model(&models.Job{}).Where("queue_name = ? AND status = 'success' AND updated_at >= ?", q, dayAgo).Count(&s24).Error
_ = db.Model(&models.Job{}).Where("queue_name = ? AND status = 'failed' AND updated_at >= ?", q, dayAgo).Count(&f24).Error _ = db.Model(&models.Job{}).
Where("queue_name = ? AND status IN ('queued','scheduled','pending') AND scheduled_at <= ?", q, now).
Count(&qd).Error
_ = db.Model(&models.Job{}).
Where("queue_name = ? AND status IN ('queued','scheduled','pending') AND scheduled_at > ?", q, now).
Count(&qf).Error
// Sum result.ready / result.failed over successes in last 24h
_ = db.Model(&models.Job{}).
Select("COALESCE(SUM((result->>'ready')::int), 0)").
Where("queue_name = ? AND status = 'success' AND updated_at >= ?", q, dayAgo).
Scan(&s24).Error
_ = db.Model(&models.Job{}).
Select("COALESCE(SUM((result->>'failed')::int), 0)").
Where("queue_name = ? AND status = 'success' AND updated_at >= ?", q, dayAgo).
Scan(&f24).Error
_ = db. _ = db.
Model(&models.Job{}). Model(&models.Job{}).