Merge 1746e2ddbd into e27af97a3c

rpc/errors.go

@@ -18,6 +18,11 @@ package rpc
 
 import "fmt"
 
+var (
+	// ErrConnectionClosed is thrown when the connection is closed
+	ErrConnectionClosed = new(connectionClosedError)
+)
+
 // request is for an unknown service
 type methodNotFoundError struct {
 	service string
@@ -95,3 +100,15 @@ func (e *shutdownError) Code() int {
 func (e *shutdownError) Error() string {
 	return "server is shutting down"
 }
+
+// connectionClosedError is thrown when the connection is closed
+type connectionClosedError struct {
+}
+
+func (e *connectionClosedError) Code() int {
+	return 0
+}
+
+func (e *connectionClosedError) Error() string {
+	return "connection closed"
+}

rpc/json.go

@@ -119,6 +119,9 @@ func (c *jsonCodec) ReadRequestHeaders() ([]rpcRequest, bool, RPCError) {
 
 	var incomingMsg json.RawMessage
 	if err := c.d.Decode(&incomingMsg); err != nil {
+		if err == io.EOF {
+			return nil, false, ErrConnectionClosed
+		}
 		return nil, false, &invalidRequestError{err.Error()}
 	}
 

rpc/server.go

@@ -183,8 +183,10 @@ func (s *Server) serveRequest(codec ServerCodec, singleShot bool, options CodecO
 	for atomic.LoadInt32(&s.run) == 1 {
 		reqs, batch, err := s.readRequest(codec)
 		if err != nil {
-			glog.V(logger.Debug).Infof("%v\n", err)
+			if err != ErrConnectionClosed {
-			codec.Write(codec.CreateErrorResponse(nil, err))
+				glog.V(logger.Error).Infof("%v\n", err)
+				codec.Write(codec.CreateErrorResponse(nil, err))
+			}
 			return nil
 		}