Simplify shutdown logic a bit more

IBM · Apr 27, 2015 · 2bb62c1 · 2bb62c1
1 parent 54eb5af
commit 2bb62c1
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/async_producer.go b/async_producer.go
@@ -192,9 +192,7 @@ func (p *asyncProducer) Close() error {
 }
 
 func (p *asyncProducer) AsyncClose() {
-	go withRecover(func() {
-		p.input <- &ProducerMessage{flags: shutdown}
-	})
+	go withRecover(p.shutdown)
 }
 
 ///////////////////////////////////////////
@@ -217,9 +215,7 @@ func (p *asyncProducer) topicDispatcher() {
 		}
 
 		if msg.flags&shutdown != 0 {
-			Logger.Println("Producer shutting down.")
 			shuttingDown = true
-			go withRecover(p.shutdown)
 			continue
 		} else if msg.retries == 0 {
 			if shuttingDown {
@@ -609,6 +605,9 @@ func (p *asyncProducer) retryHandler() {
 // utility functions
 
 func (p *asyncProducer) shutdown() {
+	Logger.Println("Producer shutting down.")
+	p.input <- &ProducerMessage{flags: shutdown}
+
 	p.inFlight.Wait()
 
 	if p.ownClient {