[MM-54132] Use annotated logger for log messages from jobs (#24275)

server/channels/jobs/extract_content/worker.go

@@ -19,13 +19,13 @@ var ignoredFiles = map[string]bool{
 	"mkv": true,
 }
 
-const jobName = "ExtractContent"
-
 type AppIface interface {
 	ExtractContentFromFileInfo(fileInfo *model.FileInfo) error
 }
 
-func MakeWorker(jobServer *jobs.JobServer, app AppIface, store store.Store) model.Worker {
+func MakeWorker(jobServer *jobs.JobServer, app AppIface, store store.Store) *jobs.SimpleWorker {
+	const workerName = "ExtractContent"
+
 	isEnabled := func(cfg *model.Config) bool {
 		return true
 	}
@@ -65,10 +65,10 @@ func MakeWorker(jobServer *jobs.JobServer, app AppIface, store store.Store) mode
 			}
 			for _, fileInfo := range fileInfos {
 				if !ignoredFiles[fileInfo.Extension] {
-					mlog.Debug("extracting file", mlog.String("filename", fileInfo.Name), mlog.String("filepath", fileInfo.Path))
+					job.Logger.Debug("Extracting file", mlog.String("filename", fileInfo.Name), mlog.String("filepath", fileInfo.Path))
 					err = app.ExtractContentFromFileInfo(fileInfo)
 					if err != nil {
-						mlog.Warn("Failed to extract file content", mlog.Err(err), mlog.String("file_info_id", fileInfo.Id))
+						job.Logger.Warn("Failed to extract file content", mlog.Err(err), mlog.String("file_info_id", fileInfo.Id))
 						nErrs++
 					}
 					nFiles++
@@ -85,10 +85,10 @@ func MakeWorker(jobServer *jobs.JobServer, app AppIface, store store.Store) mode
 		job.Data["processed"] = strconv.Itoa(nFiles)
 
 		if err := jobServer.UpdateInProgressJobData(job); err != nil {
-			mlog.Error("Worker: Failed to update job data", mlog.String("worker", model.JobTypeExtractContent), mlog.String("job_id", job.Id), mlog.Err(err))
+			job.Logger.Error("Worker: Failed to update job data", mlog.Err(err))
 		}
 		return nil
 	}
-	worker := jobs.NewSimpleWorker(jobName, jobServer, execute, isEnabled)
+	worker := jobs.NewSimpleWorker(workerName, jobServer, execute, isEnabled)
 	return worker
 }