From ca7d180d4b1211ddde7858d5482f859af77b351f Mon Sep 17 00:00:00 2001 From: Son Roy Almerol Date: Sun, 17 Nov 2024 18:20:37 -0500 Subject: [PATCH] use log file for task end time --- internal/store/db.go | 10 ++++++++++ internal/store/tasks.go | 33 ++++++++++----------------------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/internal/store/db.go b/internal/store/db.go index 4cfca2b..4f7d757 100644 --- a/internal/store/db.go +++ b/internal/store/db.go @@ -196,6 +196,11 @@ func (store *Store) GetJob(id string) (*Job, error) { return nil, fmt.Errorf("GetJob: error scanning job row -> %w", err) } + exclusions, err := store.GetAllJobExclusions(id) + if err == nil { + job.Exclusions = exclusions + } + if job.LastRunUpid != nil { task, err := store.GetTaskByUPID(*job.LastRunUpid) if err != nil { @@ -324,6 +329,11 @@ func (store *Store) GetAllJobs() ([]Job, error) { return nil, fmt.Errorf("GetAllJobs: error scanning job row -> %w", err) } + exclusions, err := store.GetAllJobExclusions(job.ID) + if err == nil { + job.Exclusions = exclusions + } + if job.LastRunUpid != nil { task, err := store.GetTaskByUPID(*job.LastRunUpid) if err != nil { diff --git a/internal/store/tasks.go b/internal/store/tasks.go index 725aeda..4d5a2e9 100644 --- a/internal/store/tasks.go +++ b/internal/store/tasks.go @@ -5,6 +5,7 @@ package store import ( "fmt" "net/http" + "os" "strconv" "strings" "time" @@ -95,35 +96,21 @@ func (storeInstance *Store) GetTaskByUPID(upid string) (*Task, error) { } func (storeInstance *Store) GetTaskEndTime(task *Task) (int64, error) { - nextPage := true - var resp TasksResponse - if storeInstance.LastToken == nil && storeInstance.APIToken == nil { return -1, fmt.Errorf("GetTaskEndTime: token is required") } - page := 1 - for nextPage { - start := (page - 1) * 50 - err := storeInstance.ProxmoxHTTPRequest( - http.MethodGet, - fmt.Sprintf("/api2/json/nodes/localhost/tasks?typefilter=backup&running=false&start=%d&since=%d", start, task.StartTime), - nil, - &resp, - ) - if err != nil { - return -1, fmt.Errorf("GetTaskEndTime: error creating http request -> %w", err) - } + upidSplit := strings.Split(task.UPID, ":") + if len(upidSplit) < 4 { + return -1, fmt.Errorf("GetTaskEndTime: error getting tasks: invalid upid") + } - for _, respTask := range resp.Data { - if respTask.UPID == task.UPID { - return respTask.EndTime, nil - } - } + parsed := upidSplit[3] + logFolder := parsed[len(parsed)-2:] - if resp.Total <= page*50 { - nextPage = false - } + logStat, err := os.Stat(fmt.Sprintf("/var/log/proxmox-backup/tasks/%s/%s", logFolder, task.UPID)) + if err == nil { + return logStat.ModTime().Unix(), nil } return -1, fmt.Errorf("GetTaskEndTime: error getting tasks: not found")