From: ChaiShushan <chaishushan@gmail.com>
Date: Tue, 9 Jul 2013 01:12:05 +0000 (+1000)
Subject: net/rpc: use log.Print and return error instead log.Fatal
X-Git-Tag: go1.2rc2~1102
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e23d19e23535837fad3d1095e48fe877dbb38c10;p=gostls13.git

net/rpc: use log.Print and return error instead log.Fatal

R=r
CC=golang-dev
https://golang.org/cl/10758044
---

diff --git a/src/pkg/net/rpc/server.go b/src/pkg/net/rpc/server.go
index 253ad23fe3..fe1cdde1ad 100644
--- a/src/pkg/net/rpc/server.go
+++ b/src/pkg/net/rpc/server.go
@@ -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)
 	}