mirror/phylum
1
0
Fork 0
mirror of https://codeberg.org/shroff/phylum.git synced 2026-01-03 18:20:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

[server][steve] Only return info from list query

Browse Source
This commit is contained in:
Abhishek Shroff
2025-06-22 21:07:46 +05:30
parent 7e35784dca
commit 7313845be7
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/internal/command/admin/jobs/cmd.go
View File

@@ -4,7 +4,6 @@ import (
"context"
"fmt"
"os"
"time"
"codeberg.org/shroff/phylum/server/internal/db"
"codeberg.org/shroff/phylum/server/internal/steve"
@@ -44,7 +43,7 @@ func setupListCommand() *cobra.Command {
os.Exit(1)
}
for _, j := range jobs {
fmt.Printf("%4d %s %5s %s %s\n", j.ID, j.CreatedAt.Format(time.DateTime), j.Status.String(), j.Kind, j.EncodedArgs)
fmt.Printf("%4d %5s %s %s\n", j.ID, j.Status.String(), j.Kind, j.EncodedArgs)
}
}
cmd.Flags().StringSlice("status-only", []string{}, "Show only jobs matching the given status(es)")

25
server/internal/steve/db.go
View File

@@ -101,11 +101,14 @@ FROM cte
if rows, err := db.Query(q); err != nil {
return nil, err
} else {
info, err := pgx.CollectExactlyOneRow(rows, scanJobInfo)
if errors.Is(err, pgx.ErrNoRows) {
err = errNoJobs
if info, err := pgx.CollectExactlyOneRow(rows, scanJobInfo); err != nil {
if errors.Is(err, pgx.ErrNoRows) {
err = errNoJobs
}
return nil, err
} else {
return &info, nil
}
return info, err
}
}
@@ -144,9 +147,9 @@ func deleteSequences(db db.Handler, jobID int32) error {
return err
}
func ListJobs(db db.Handler, only, exclude []JobStatus) ([]JobRow, error) {
func ListJobs(db db.Handler, only, exclude []JobStatus) ([]JobInfo, error) {
qb := strings.Builder{}
qb.WriteString("SELECT id, status, attempts, created_at, scheduled_at, kind, args, errors FROM jobs")
qb.WriteString("SELECT id, status, attempts, kind, args FROM jobs")
if len(only) > 0 {
qb.WriteString(" WHERE status = ANY (@only::SMALLINT[])")
} else if len(exclude) > 0 {
@@ -161,11 +164,11 @@ func ListJobs(db db.Handler, only, exclude []JobStatus) ([]JobRow, error) {
if rows, err := db.Query(qb.String(), args); err != nil {
return nil, err
} else {
return pgx.CollectRows(rows, (scanJobRow))
return pgx.CollectRows(rows, scanJobInfo)
}
}
func scanJobInfo(row pgx.CollectableRow) (*JobInfo, error) {
func scanJobInfo(row pgx.CollectableRow) (JobInfo, error) {
var job JobInfo
err := row.Scan(
&job.ID,
@@ -174,11 +177,7 @@ func scanJobInfo(row pgx.CollectableRow) (*JobInfo, error) {
&job.Kind,
&job.EncodedArgs,
)
if err != nil {
return nil, err
}
return &job, nil
return job, err
}
func scanJobRow(row pgx.CollectableRow) (JobRow, error) {
var job JobRow