From 0cced01f02a86a73bb00750edfade8f6154fa629 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Mon, 28 Mar 2022 09:46:45 +0800 Subject: [PATCH] chore(worker): remove BeforeRun and AfterRun interface fix: https://github.com/golang-queue/queue/issues/45 Signed-off-by: Bo-Yi Wu --- consumer.go | 10 ---------- queue.go | 8 -------- worker.go | 4 ---- worker_empty.go | 2 -- worker_message.go | 2 -- worker_task.go | 2 -- 6 files changed, 28 deletions(-) diff --git a/consumer.go b/consumer.go index cbd31e2..cb0b9ea 100644 --- a/consumer.go +++ b/consumer.go @@ -37,16 +37,6 @@ func (s *Consumer) BusyWorkers() uint64 { return s.metric.BusyWorkers() } -// BeforeRun run script before start worker -func (s *Consumer) BeforeRun() error { - return nil -} - -// AfterRun run script after start worker -func (s *Consumer) AfterRun() error { - return nil -} - func (s *Consumer) handle(job Job) error { // create channel with buffer size 1 to avoid goroutine leak done := make(chan error, 1) diff --git a/queue.go b/queue.go index d094e30..fd3eb5f 100644 --- a/queue.go +++ b/queue.go @@ -179,10 +179,6 @@ func (q *Queue) QueueTaskWithTimeout(timeout time.Duration, task TaskFunc) error } func (q *Queue) work(task QueuedMessage) { - if err := q.worker.BeforeRun(); err != nil { - q.logger.Error(err) - } - // to handle panic cases from inside the worker // in such case, we start a new goroutine defer func() { @@ -196,10 +192,6 @@ func (q *Queue) work(task QueuedMessage) { if err := q.worker.Run(task); err != nil { q.logger.Errorf("runtime error: %s", err.Error()) } - - if err := q.worker.AfterRun(); err != nil { - q.logger.Error(err) - } } func (q *Queue) schedule() { diff --git a/worker.go b/worker.go index a3e43a9..8481176 100644 --- a/worker.go +++ b/worker.go @@ -2,12 +2,8 @@ package queue // Worker interface type Worker interface { - // BeforeRun is called before starting the worker - BeforeRun() error // Run is called to start the worker Run(task QueuedMessage) error - // BeforeRun is called after starting the worker - AfterRun() error // Shutdown is called if stop all worker Shutdown() error // Queue to send message in Queue diff --git a/worker_empty.go b/worker_empty.go index fa4fdff..3781382 100644 --- a/worker_empty.go +++ b/worker_empty.go @@ -5,8 +5,6 @@ var _ Worker = (*emptyWorker)(nil) // just for unit testing, don't use it. type emptyWorker struct{} -func (w *emptyWorker) BeforeRun() error { return nil } -func (w *emptyWorker) AfterRun() error { return nil } func (w *emptyWorker) Run(task QueuedMessage) error { return nil } func (w *emptyWorker) Shutdown() error { return nil } func (w *emptyWorker) Queue(task QueuedMessage) error { return nil } diff --git a/worker_message.go b/worker_message.go index 402d375..4ad8b49 100644 --- a/worker_message.go +++ b/worker_message.go @@ -12,8 +12,6 @@ type messageWorker struct { messages chan QueuedMessage } -func (w *messageWorker) BeforeRun() error { return nil } -func (w *messageWorker) AfterRun() error { return nil } func (w *messageWorker) Run(task QueuedMessage) error { if string(task.Bytes()) == "panic" { panic("show panic") diff --git a/worker_task.go b/worker_task.go index 17b4c28..55e931d 100644 --- a/worker_task.go +++ b/worker_task.go @@ -12,8 +12,6 @@ type taskWorker struct { messages chan QueuedMessage } -func (w *taskWorker) BeforeRun() error { return nil } -func (w *taskWorker) AfterRun() error { return nil } func (w *taskWorker) Run(task QueuedMessage) error { if v, ok := task.(Job); ok { if v.Task != nil {