unistack-org/micro
4
0
Fork 3
Code Issues 18 Pull Requests 1 Actions Packages Projects Releases 264 Wiki Activity

Strip named registration

Browse Source
This commit is contained in:
Asim 2015-12-02 01:18:32 +00:00
parent dae745f30f
commit 7a870dfbb1
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/rpc_server.go
View File

@ -110,7 +110,7 @@ func (s *rpcServer) NewHandler(h interface{}) Handler {
} }
func (s *rpcServer) Handle(h Handler) error { func (s *rpcServer) Handle(h Handler) error {
if err := s.rpc.Register(h.Handler()); err != nil { if err := s.rpc.register(h.Handler()); err != nil {
return err return err
} }
s.Lock() s.Lock()

11
server/rpcplus_server.go
View File

@ -94,10 +94,6 @@ func isExportedOrBuiltinType(t reflect.Type) bool {
return isExported(t.Name()) || t.PkgPath() == "" return isExported(t.Name()) || t.PkgPath() == ""
} }
func (server *server) Register(rcvr interface{}) error {
return server.register(rcvr, "", false)
}
// prepareMethod returns a methodType for the provided method or nil // prepareMethod returns a methodType for the provided method or nil
// in case if the method was unsuitable. // in case if the method was unsuitable.
func prepareMethod(method reflect.Method) *methodType { func prepareMethod(method reflect.Method) *methodType {
@ -173,7 +169,7 @@ func prepareMethod(method reflect.Method) *methodType {
return &methodType{method: method, ArgType: argType, ReplyType: replyType, ContextType: contextType, stream: stream} return &methodType{method: method, ArgType: argType, ReplyType: replyType, ContextType: contextType, stream: stream}
} }
func (server *server) register(rcvr interface{}, name string, useName bool) error { func (server *server) register(rcvr interface{}) error {
server.mu.Lock() server.mu.Lock()
defer server.mu.Unlock() defer server.mu.Unlock()
if server.serviceMap == nil { if server.serviceMap == nil {
@ -183,13 +179,10 @@ func (server *server) register(rcvr interface{}, name string, useName bool) erro
s.typ = reflect.TypeOf(rcvr) s.typ = reflect.TypeOf(rcvr)
s.rcvr = reflect.ValueOf(rcvr) s.rcvr = reflect.ValueOf(rcvr)
sname := reflect.Indirect(s.rcvr).Type().Name() sname := reflect.Indirect(s.rcvr).Type().Name()
if useName {
sname = name
}
if sname == "" { if sname == "" {
log.Fatal("rpc: no service name for type", s.typ.String()) log.Fatal("rpc: no service name for type", s.typ.String())
} }
if !isExported(sname) && !useName { if !isExported(sname) {
s := "rpc Register: type " + sname + " is not exported" s := "rpc Register: type " + sname + " is not exported"
log.Print(s) log.Print(s)
return errors.New(s) return errors.New(s)