Pass a logger instead of embedding on job (#24650)
* pass a logger instead of embedding on job * leverage mlog.Millis * use worker logger with HandleJobPanic * rely on existing LogClone instead * guard Job.LogClone against nil Job * s/workername/worker_name * Revert "rely on existing LogClone instead" This reverts commit 17303cbac90d4b01815abca1309b78b97de368fb. * Revert "guard Job.LogClone against nil Job" This reverts commit f1ae22dee58d76f084582857830ffe8d4c546d7e.
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
aa172294bd
Коммит
47bfa2b66b
@@ -501,17 +501,16 @@ func TestUpdateInProgressJobData(t *testing.T) {
|
||||
|
||||
func TestHandleJobPanic(t *testing.T) {
|
||||
t.Run("no panic", func(t *testing.T) {
|
||||
jobServer, _, _ := makeJobServer(t)
|
||||
logger := mlog.CreateConsoleTestLogger(t)
|
||||
jobServer, _, _ := makeJobServer(t)
|
||||
|
||||
job := &model.Job{
|
||||
Type: model.JobTypeImportProcess,
|
||||
Status: model.JobStatusInProgress,
|
||||
}
|
||||
job.InitLogger(logger)
|
||||
|
||||
f := func() {
|
||||
defer jobServer.HandleJobPanic(job)
|
||||
defer jobServer.HandleJobPanic(logger, job)
|
||||
fmt.Println("OK")
|
||||
}
|
||||
|
||||
@@ -520,17 +519,16 @@ func TestHandleJobPanic(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("with panic string", func(t *testing.T) {
|
||||
jobServer, mockStore, metrics := makeJobServer(t)
|
||||
logger := mlog.CreateConsoleTestLogger(t)
|
||||
jobServer, mockStore, metrics := makeJobServer(t)
|
||||
|
||||
job := &model.Job{
|
||||
Type: model.JobTypeImportProcess,
|
||||
Status: model.JobStatusInProgress,
|
||||
}
|
||||
job.InitLogger(logger)
|
||||
|
||||
f := func() {
|
||||
defer jobServer.HandleJobPanic(job)
|
||||
defer jobServer.HandleJobPanic(logger, job)
|
||||
panic("not OK")
|
||||
}
|
||||
|
||||
@@ -542,17 +540,16 @@ func TestHandleJobPanic(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("with panic error", func(t *testing.T) {
|
||||
jobServer, mockStore, metrics := makeJobServer(t)
|
||||
logger := mlog.CreateConsoleTestLogger(t)
|
||||
jobServer, mockStore, metrics := makeJobServer(t)
|
||||
|
||||
job := &model.Job{
|
||||
Type: model.JobTypeImportProcess,
|
||||
Status: model.JobStatusInProgress,
|
||||
}
|
||||
job.InitLogger(logger)
|
||||
|
||||
f := func() {
|
||||
defer jobServer.HandleJobPanic(job)
|
||||
defer jobServer.HandleJobPanic(logger, job)
|
||||
panic(fmt.Errorf("not OK"))
|
||||
}
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user