]> Cypherpunks repositories - gostls13.git/commitdiff
net/rpc: use log.Print and return error instead log.Fatal
authorChaiShushan <chaishushan@gmail.com>
Tue, 9 Jul 2013 01:12:05 +0000 (11:12 +1000)
committerRob Pike <r@golang.org>
Tue, 9 Jul 2013 01:12:05 +0000 (11:12 +1000)
R=r
CC=golang-dev
https://golang.org/cl/10758044

src/pkg/net/rpc/server.go

index 253ad23fe3eb8ea8dbfd30944e8d8d22abf7c6cc..fe1cdde1ad9e2a6cd9014d454e3b31fc5f7fb55d 100644 (file)
@@ -247,10 +247,12 @@ func (server *Server) register(rcvr interface{}, name string, useName bool) erro
                sname = name
        }
        if sname == "" {
-               log.Fatal("rpc: no service name for type", s.typ.String())
+               s := "rpc.Register: no service name for type " + s.typ.String()
+               log.Print(s)
+               return errors.New(s)
        }
        if !isExported(sname) && !useName {
-               s := "rpc Register: type " + sname + " is not exported"
+               s := "rpc.Register: type " + sname + " is not exported"
                log.Print(s)
                return errors.New(s)
        }