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

Cleanup: remove fmt.Sprintf from sendAPIError calls

Browse Source
This commit is contained in:
Sybren A. Stüvel 2022-02-17 17:30:27 +01:00
parent 3057a009e7
commit 31e39e2137
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/manager/api_impl/jobs.go
View File

@ -142,7 +142,7 @@ func (f *Flamenco) TaskUpdate(e echo.Context, taskID string) error {
dbTask, err := f.persist.FetchTask(ctx, taskID) dbTask, err := f.persist.FetchTask(ctx, taskID)
if err != nil { if err != nil {
logger.Warn().Err(err).Msg("cannot fetch task") logger.Warn().Err(err).Msg("cannot fetch task")
return sendAPIError(e, http.StatusNotFound, fmt.Sprintf("task %+v not found", taskID)) return sendAPIError(e, http.StatusNotFound, "task %+v not found", taskID)
} }
if dbTask == nil { if dbTask == nil {
panic("task could not be fetched, but database gave no error either") panic("task could not be fetched, but database gave no error either")
@ -157,13 +157,13 @@ func (f *Flamenco) TaskUpdate(e echo.Context, taskID string) error {
if dbTask.Worker == nil { if dbTask.Worker == nil {
logger.Warn(). logger.Warn().
Msg("worker trying to update task that's not assigned to any worker") Msg("worker trying to update task that's not assigned to any worker")
return sendAPIError(e, http.StatusConflict, fmt.Sprintf("task %+v is not assigned to any worker, so also not to you", taskID)) return sendAPIError(e, http.StatusConflict, "task %+v is not assigned to any worker, so also not to you", taskID)
} }
if dbTask.Worker.UUID != worker.UUID { if dbTask.Worker.UUID != worker.UUID {
logger.Warn(). logger.Warn().
Str("assignedWorkerID", dbTask.Worker.UUID). Str("assignedWorkerID", dbTask.Worker.UUID).
Msg("worker trying to update task that's assigned to another worker") Msg("worker trying to update task that's assigned to another worker")
return sendAPIError(e, http.StatusConflict, fmt.Sprintf("task %+v is not assigned to you, but to worker %v", taskID, dbTask.Worker.UUID)) return sendAPIError(e, http.StatusConflict, "task %+v is not assigned to you", taskID)
} }
// TODO: check whether this task may undergo the requested status change. // TODO: check whether this task may undergo the requested status change.