Merge pull request #1331 from jehiah/exit_closed_channel_1331

nsqd: handle repeated  calls to Exit()

apps/nsqd/main.go

@@ -87,7 +87,9 @@ func (p *program) Start() error {
 		// we don't want to un-register our sigterm handler which would
 		// cause default go behavior to apply
 		for range signalChan {
-			p.nsqd.TermSignal()
+			p.once.Do(func() {
+				p.nsqd.Exit()
+			})
 		}
 	}()
 	signal.Notify(signalChan, syscall.SIGTERM)

nsqd/nsqd.go

@@ -50,6 +50,7 @@ type NSQD struct {
 
 	dl        *dirlock.DirLock
 	isLoading int32
+	isExiting int32
 	errValue  atomic.Value
 	startTime time.Time
 
@@ -401,13 +402,11 @@ func (n *NSQD) PersistMetadata() error {
 	return nil
 }
 
-// TermSignal handles a SIGTERM calling Exit
-// This is a noop after first call
-func (n *NSQD) TermSignal() {
-	n.Exit()
-}
-
 func (n *NSQD) Exit() {
+	if !atomic.CompareAndSwapInt32(&n.isExiting, 0, 1) {
+		// avoid double call
+		return
+	}
 	if n.tcpListener != nil {
 		n.tcpListener.Close()
 	}