queue.go

@@ -121,9 +121,7 @@ func (q *Queue) Enqueue(job GenericJob) error {
 		q.readyQueue = newReadyQueue
 
 		if q.eventBus != nil && len(q.readyQueue) > 0 {
-			if q.manger != nil && q.manger.logger != nil {
-				q.manger.logger.Info("Job ready", "job_id", job.GetID())
-			}
+			Info("Job ready", "job_id", job.GetID())
 			
 			q.eventBus.Publish(JobReady, nil)
 		}

worker.go

@@ -116,9 +116,7 @@ func (w *LocalWorker) Start() error {
 	w.wg.Wait()
 	w.status = WorkerStatusRunning
 
-	if w.manager != nil && w.manager.logger != nil {
-		w.manager.logger.Info("Worker started", "worker", w.ID)
-	}
+	Info("Worker started", "worker", w.ID)
 
 	return nil
 }
@@ -164,9 +162,7 @@ func (w *LocalWorker) Stop() error {
 		stopChan <- true
 	}
 
-	if w.manager != nil && w.manager.logger != nil {
-		w.manager.logger.Info("Worker stopped", "worker", w.ID)
-	}
+	Info("Worker stopped", "worker", w.ID)
 
 	return nil
 }
@@ -175,9 +171,7 @@ func (w *LocalWorker) run(jobChannel chan GenericJob, stopChan chan bool, cancel
 
 	workerThreadID := w.ID.String() + "-" + fmt.Sprintf("%p", &w)
 
-	if w.manager != nil && w.manager.logger != nil {
-		w.manager.logger.Info("Worker thread with id started", "worker", w.ID, "thread_id", workerThreadID)
-	}
+	Info("Worker thread with id started", "worker", w.ID, "thread_id", workerThreadID)
 	
 	stopFlag := false
 	w.wg.Done()
@@ -212,9 +206,7 @@ func (w *LocalWorker) run(jobChannel chan GenericJob, stopChan chan bool, cancel
 					ctx, cancel = context.WithTimeout(ctx, timeout)
 				}
 
-				if w.manager != nil && w.manager.logger != nil {
-					w.manager.logger.Info("Executing job on worker thread", "worker", w.ID, "thread_id", workerThreadID, "job_id", job.GetID())
-				}
+				Info("Executing job on worker thread", "worker", w.ID, "thread_id", workerThreadID, "job_id", job.GetID())
 
 				_, err = job.Execute(ctx)
 				jobFailed := false
@@ -244,9 +236,8 @@ func (w *LocalWorker) run(jobChannel chan GenericJob, stopChan chan bool, cancel
 			if w.manager != nil && w.manager.dbSaver != nil {
 				err = w.manager.dbSaver.SaveJob(job)
 				if err != nil {
-					if w.manager.logger != nil {
-						w.manager.logger.Error("Error while saving job", "job_id", job.GetID(), "error", err)
-					}
+					Error("Error while saving job", "job_id", job.GetID(), "error", err)
+
 				}
 			}
 
@@ -264,9 +255,7 @@ func (w *LocalWorker) run(jobChannel chan GenericJob, stopChan chan bool, cancel
 		}
 	}
 
-	if w.manager != nil && w.manager.logger != nil {
-		w.manager.logger.Info("Worker thread with id stopped", "worker", w.ID, "thread_id", workerThreadID)
-	}
+	Info("Worker thread with id stopped", "worker", w.ID, "thread_id", workerThreadID)
 
 }