Merge pull request #560 from twmb/clean_close_521

nsqd: do not print EOF when closing cleanly
nsqio · Mar 23, 2015 · 48bb782 · 48bb782
2 parents 831c218 + 42c88e8
commit 48bb782
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/nsqd/protocol_v2.go b/nsqd/protocol_v2.go
@@ -62,7 +62,11 @@ func (p *protocolV2) IOLoop(conn net.Conn) error {
 		// ie. the returned slice is only valid until the next call to it
 		line, err = client.Reader.ReadSlice('\n')
 		if err != nil {
-			err = fmt.Errorf("failed to read command - %s", err)
+			if atomic.LoadInt32(&client.State) == stateClosing {
+				err = nil
+			} else {
+				err = fmt.Errorf("failed to read command - %s", err)
+			}
 			break
 		}