blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manager: prevent logging an error when fetching unknown worker

Browse Source 
Prevent logging an error in the persistence layer when an unknown worker
is requested.

This reduces the noise & confusion when the web interface is showing the
details of a worker, but the worker gets removed by someone else. Or when
the Manager doesn't know about a Worker and it's trying to connect.

See #104282.
This commit is contained in:
Sybren A. Stüvel 2024-01-25 12:36:32 +01:00
parent 70faa4e225
commit 9afd79d8c0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/manager/persistence/workers.go
View File

@ -75,10 +75,14 @@ func (db *DB) FetchWorker(ctx context.Context, uuid string) (*Worker, error) {
w := Worker{} w := Worker{}
tx := db.gormDB.WithContext(ctx). tx := db.gormDB.WithContext(ctx).
Preload("Tags"). Preload("Tags").
First(&w, "uuid = ?", uuid) Find(&w, "uuid = ?", uuid).
Limit(1)
if tx.Error != nil { if tx.Error != nil {
return nil, workerError(tx.Error, "fetching worker") return nil, workerError(tx.Error, "fetching worker")
} }
if w.ID == 0 {
return nil, ErrWorkerNotFound
}
return &w, nil return &w, nil
} }