chore: check redis closed. (#2)

Signed-off-by: Bo-Yi Wu <[email protected]>

Author: appleboy

redis.go

@@ -205,9 +205,9 @@ func (s *Worker) Shutdown() error {
 	}
 
 	s.stopOnce.Do(func() {
-		close(s.stop)
 		s.pubsub.Close()
 		s.rdb.Close()
+		close(s.stop)
 	})
 	return nil
 }
@@ -244,7 +244,7 @@ func (s *Worker) Run() error {
 	// check queue status
 	select {
 	case <-s.stop:
-		return queue.ErrQueueShutdown
+		return nil
 	default:
 	}
 
@@ -263,6 +263,13 @@ func (s *Worker) Run() error {
 	}
 
 	for {
+		// check queue status
+		select {
+		case <-s.stop:
+			return nil
+		default:
+		}
+
 		select {
 		case m, ok := <-ch:
 			select {

redis_test.go

@@ -251,10 +251,10 @@ func TestGoroutineLeak(t *testing.T) {
 		m.Message = fmt.Sprintf("foobar: %d", i+1)
 		assert.NoError(t, q.Queue(m))
 	}
-	time.Sleep(2 * time.Second)
+	time.Sleep(1 * time.Second)
 	q.Shutdown()
 	q.Wait()
-	time.Sleep(2 * time.Second)
+	time.Sleep(1 * time.Second)
 	fmt.Println("number of goroutines:", runtime.NumGoroutine())
 }