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
@@ -280,7 +280,6 @@ func (s *MmctlE2ETestSuite) TestExportJobShowCmdF() {
|
||||
Type: model.JobTypeExportProcess,
|
||||
})
|
||||
s.Require().Nil(appErr)
|
||||
job.Logger = nil
|
||||
|
||||
time.Sleep(time.Millisecond)
|
||||
|
||||
@@ -370,7 +369,6 @@ func (s *MmctlE2ETestSuite) TestExportJobListCmdF() {
|
||||
Type: model.JobTypeExportProcess,
|
||||
})
|
||||
s.Require().Nil(appErr)
|
||||
job2.Logger = nil
|
||||
|
||||
time.Sleep(time.Millisecond)
|
||||
|
||||
@@ -378,7 +376,6 @@ func (s *MmctlE2ETestSuite) TestExportJobListCmdF() {
|
||||
Type: model.JobTypeExportProcess,
|
||||
})
|
||||
s.Require().Nil(appErr)
|
||||
job3.Logger = nil
|
||||
|
||||
err := exportJobListCmdF(c, cmd, nil)
|
||||
s.Require().Nil(err)
|
||||
|
||||
@@ -76,7 +76,6 @@ func (s *MmctlE2ETestSuite) TestExtractJobShowCmdF() {
|
||||
Data: map[string]string{},
|
||||
})
|
||||
s.Require().Nil(appErr)
|
||||
job.Logger = nil
|
||||
|
||||
s.Run("no permissions", func() {
|
||||
printer.Clean()
|
||||
@@ -170,7 +169,6 @@ func (s *MmctlE2ETestSuite) TestExtractJobListCmdF() {
|
||||
Data: map[string]string{},
|
||||
})
|
||||
s.Require().Nil(appErr)
|
||||
job2.Logger = nil
|
||||
|
||||
time.Sleep(time.Millisecond)
|
||||
|
||||
@@ -179,7 +177,6 @@ func (s *MmctlE2ETestSuite) TestExtractJobListCmdF() {
|
||||
Data: map[string]string{},
|
||||
})
|
||||
s.Require().Nil(appErr)
|
||||
job3.Logger = nil
|
||||
|
||||
time.Sleep(time.Millisecond)
|
||||
|
||||
|
||||
@@ -256,7 +256,6 @@ func (s *MmctlE2ETestSuite) TestImportJobShowCmdF() {
|
||||
Data: map[string]string{"import_file": "import1.zip"},
|
||||
})
|
||||
s.Require().Nil(appErr)
|
||||
job.Logger = nil
|
||||
|
||||
s.Run("no permissions", func() {
|
||||
printer.Clean()
|
||||
@@ -350,7 +349,6 @@ func (s *MmctlE2ETestSuite) TestImportJobListCmdF() {
|
||||
Data: map[string]string{"import_file": "import2.zip"},
|
||||
})
|
||||
s.Require().Nil(appErr)
|
||||
job2.Logger = nil
|
||||
|
||||
time.Sleep(time.Millisecond)
|
||||
|
||||
@@ -359,7 +357,6 @@ func (s *MmctlE2ETestSuite) TestImportJobListCmdF() {
|
||||
Data: map[string]string{"import_file": "import3.zip"},
|
||||
})
|
||||
s.Require().Nil(appErr)
|
||||
job3.Logger = nil
|
||||
|
||||
err := importJobListCmdF(c, cmd, nil)
|
||||
s.Require().Nil(err)
|
||||
|
||||
Ссылка в новой задаче
Block a user