bugfix with pub sub name collision with RPC method

rpc/v2/server.go

@@ -130,7 +130,7 @@ func (s *Server) ServeCodec(codec ServerCodec) {
 			const size = 64 << 10
 			buf := make([]byte, size)
 			buf = buf[:runtime.Stack(buf, false)]
-			glog.Errorln(buf)
+			glog.Errorln(string(buf))
 		}
 		codec.Close()
 	}()
@@ -437,6 +437,7 @@ func (s *Server) readRequest(codec ServerCodec) ([]*serverRequest, bool, RPCErro
 			continue
 		}
 
+		if r.isPubSub { // eth_subscribe
 			if callb, ok := svc.subscriptions[r.method]; ok {
 				requests[i] = &serverRequest{id: r.id, svcname: svc.name, callb: callb}
 				if r.params != nil && len(callb.argTypes) > 0 {
@@ -448,6 +449,9 @@ func (s *Server) readRequest(codec ServerCodec) ([]*serverRequest, bool, RPCErro
 						requests[i].err = &invalidParamsError{err.Error()}
 					}
 				}
+			} else {
+				requests[i].err = &methodNotFoundError{subscribeMethod, r.method}
+			}
 			continue
 		}
 

rpc/v2/utils.go

@@ -125,13 +125,13 @@ METHODS:
 			continue
 		}
 
-		if isPubSub(mtype) {
 		var h callback
+		h.isSubscribe = isPubSub(mtype)
 		h.rcvr = rcvr
 		h.method = method
 		h.errPos = -1
-			h.isSubscribe = true
 
+		if h.isSubscribe {
 			h.argTypes = make([]reflect.Type, mtype.NumIn()-1) // skip rcvr type
 			for i := 1; i < mtype.NumIn(); i++ {
 				argType := mtype.In(i)
@@ -146,9 +146,6 @@ METHODS:
 			continue METHODS
 		}
 
-		var h callback
-		h.rcvr = rcvr
-		h.method = method
 		numIn := mtype.NumIn()
 
 		// determine method arguments, ignore first arg since it's the receiver type