Skip to content

Commit 8af744c

Browse files
authored
chore(worker): remove BeforeRun and AfterRun interface (#46)
1 parent f2b7091 commit 8af744c

6 files changed

+0
-28
lines changed

consumer.go

-10
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,6 @@ func (s *Consumer) BusyWorkers() uint64 {
3737
return s.metric.BusyWorkers()
3838
}
3939

40-
// BeforeRun run script before start worker
41-
func (s *Consumer) BeforeRun() error {
42-
return nil
43-
}
44-
45-
// AfterRun run script after start worker
46-
func (s *Consumer) AfterRun() error {
47-
return nil
48-
}
49-
5040
func (s *Consumer) handle(job Job) error {
5141
// create channel with buffer size 1 to avoid goroutine leak
5242
done := make(chan error, 1)

queue.go

-8
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,6 @@ func (q *Queue) QueueTaskWithTimeout(timeout time.Duration, task TaskFunc) error
179179
}
180180

181181
func (q *Queue) work(task QueuedMessage) {
182-
if err := q.worker.BeforeRun(); err != nil {
183-
q.logger.Error(err)
184-
}
185-
186182
// to handle panic cases from inside the worker
187183
// in such case, we start a new goroutine
188184
defer func() {
@@ -196,10 +192,6 @@ func (q *Queue) work(task QueuedMessage) {
196192
if err := q.worker.Run(task); err != nil {
197193
q.logger.Errorf("runtime error: %s", err.Error())
198194
}
199-
200-
if err := q.worker.AfterRun(); err != nil {
201-
q.logger.Error(err)
202-
}
203195
}
204196

205197
func (q *Queue) schedule() {

worker.go

-4
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@ package queue
22

33
// Worker interface
44
type Worker interface {
5-
// BeforeRun is called before starting the worker
6-
BeforeRun() error
75
// Run is called to start the worker
86
Run(task QueuedMessage) error
9-
// BeforeRun is called after starting the worker
10-
AfterRun() error
117
// Shutdown is called if stop all worker
128
Shutdown() error
139
// Queue to send message in Queue

worker_empty.go

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ var _ Worker = (*emptyWorker)(nil)
55
// just for unit testing, don't use it.
66
type emptyWorker struct{}
77

8-
func (w *emptyWorker) BeforeRun() error { return nil }
9-
func (w *emptyWorker) AfterRun() error { return nil }
108
func (w *emptyWorker) Run(task QueuedMessage) error { return nil }
119
func (w *emptyWorker) Shutdown() error { return nil }
1210
func (w *emptyWorker) Queue(task QueuedMessage) error { return nil }

worker_message.go

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ type messageWorker struct {
1212
messages chan QueuedMessage
1313
}
1414

15-
func (w *messageWorker) BeforeRun() error { return nil }
16-
func (w *messageWorker) AfterRun() error { return nil }
1715
func (w *messageWorker) Run(task QueuedMessage) error {
1816
if string(task.Bytes()) == "panic" {
1917
panic("show panic")

worker_task.go

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ type taskWorker struct {
1212
messages chan QueuedMessage
1313
}
1414

15-
func (w *taskWorker) BeforeRun() error { return nil }
16-
func (w *taskWorker) AfterRun() error { return nil }
1715
func (w *taskWorker) Run(task QueuedMessage) error {
1816
if v, ok := task.(Job); ok {
1917
if v.Task != nil {

0 commit comments

Comments
 (0)