From 3ba41476d7bbca1914566074bfe099f2193807fa Mon Sep 17 00:00:00 2001 From: dawn Date: Wed, 7 Oct 2026 02:16:01 +0300 Subject: [PATCH] spindle/engine: take the repo name for the finished log from the repos table Signed-off-by: dawn --- spindle/db/repos.go | 12 ++++++++++++ spindle/engine/engine.go | 8 +------- spindle/mill/fair.go | 20 ++------------------ 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/spindle/db/repos.go b/spindle/db/repos.go index 54aaaf67..1ec886a7 100644 --- a/spindle/db/repos.go +++ b/spindle/db/repos.go @@ -134,6 +134,18 @@ func (d *DB) GetRepoByDid(repoDid syntax.DID) (*Repo, error) { )) } +// forks and repos this spindle doesn't track fall back to their did +func (d *DB) RepoName(repoDid string) string { + if d == nil || repoDid == "" { + return repoDid + } + repo, err := d.GetRepoByDid(syntax.DID(repoDid)) + if err != nil || repo.Name == "" { + return repoDid + } + return repo.Name +} + func (d *DB) GetRepoByOwnerRkey(owner syntax.DID, rkey syntax.RecordKey) (*Repo, error) { return scanRepo(d.QueryRow( `select knot, owner, rkey, coalesce(repo_did, ''), coalesce(name, '') from repos where owner = ? and rkey = ?`, diff --git a/spindle/engine/engine.go b/spindle/engine/engine.go index 7ac52b82..d9ff2798 100644 --- a/spindle/engine/engine.go +++ b/spindle/engine/engine.go @@ -293,16 +293,10 @@ func StartWorkflows(l *slog.Logger, vault secrets.Manager, cfg *config.Config, q if repoDID == "" && pipeline != nil { repoDID = pipeline.RepoDid.String() } - var repoName string - if pipeline != nil { - if md := pipeline.TriggerMetadata; md != nil && md.Repo != nil && md.Repo.Repo != nil { - repoName = *md.Repo.Repo - } - } wl := l.With( "owner_did", w.OwnerDID, "repo_did", repoDID, - "repo", repoName, + "repo", db.RepoName(repoDID), "pipeline_id", pipelineId.String(), "workflow_id", wid.String(), "workflow", wid.Name, diff --git a/spindle/mill/fair.go b/spindle/mill/fair.go index 99ac6981..dc608ea7 100644 --- a/spindle/mill/fair.go +++ b/spindle/mill/fair.go @@ -1,10 +1,6 @@ package mill -import ( - "github.com/bluesky-social/indigo/atproto/syntax" - - "tangled.org/core/spindle/observability" -) +import "tangled.org/core/spindle/observability" // a workflow waiting in place for a seat. when a seat frees up, waiters bid // one at a time, starting with the owner that has the fewest workflows on @@ -114,22 +110,10 @@ func (m *Mill) workflowCounts() []observability.MillWorkflows { for k, n := range counts { name, ok := names[k.repo] if !ok { - name = m.repoName(k.repo) + name = m.db.RepoName(k.repo) names[k.repo] = name } out = append(out, observability.MillWorkflows{State: k.state, OwnerDID: k.owner, RepoDID: k.repo, Repo: name, Count: n}) } return out } - -// forks and repos this spindle doesn't track fall back to their did -func (m *Mill) repoName(repoDID string) string { - if m.db == nil || repoDID == "" { - return repoDID - } - repo, err := m.db.GetRepoByDid(syntax.DID(repoDID)) - if err != nil || repo.Name == "" { - return repoDID - } - return repo.Name -} -- 2.51.2