Skip to content

job_kind name consistent #8449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
himadrisingh merged 2 commits into from
Jan 16, 2026
Merged

job_kind name consistent #8449

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b93dc20
job_kind name consistent
himadrisingh Dec 4, 2025
8815d16
Merge branch 'main' into rename-logging
himadrisingh Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions admin/jobs/river/river.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,15 +805,15 @@ func (h *ErrorHandler) HandleError(ctx context.Context, job *rivertype.JobRow, e
if job.Attempt >= job.MaxAttempts {
var args string
_ = json.Unmarshal(job.EncodedArgs, &args) // ignore parse errors
h.logger.Error("Job failed, max attempts reached", zap.Int64("job_id", job.ID), zap.Int("num_attempt", job.Attempt), zap.Int("max_attempts", job.MaxAttempts), zap.String("kind", job.Kind), zap.String("args", args), zap.Error(err))
h.logger.Error("Job failed, max attempts reached", zap.Int64("job_id", job.ID), zap.Int("num_attempt", job.Attempt), zap.Int("max_attempts", job.MaxAttempts), zap.String("job_kind", job.Kind), zap.String("args", args), zap.Error(err))
}
return nil
}

func (h *ErrorHandler) HandlePanic(ctx context.Context, job *rivertype.JobRow, panicVal any, trace string) *river.ErrorHandlerResult {
var args string
_ = json.Unmarshal(job.EncodedArgs, &args) // ignore parse errors
h.logger.Error("Job panicked", zap.Int64("job_id", job.ID), zap.String("kind", job.Kind), zap.String("args", args), zap.Any("panic_val", panicVal), zap.String("trace", trace))
h.logger.Error("Job panicked", zap.Int64("job_id", job.ID), zap.String("job_kind", job.Kind), zap.String("args", args), zap.Any("panic_val", panicVal), zap.String("trace", trace))
// Set the job to be immediately cancelled
return &river.ErrorHandlerResult{SetCancelled: true}
}
Expand Down
Loading