From 078c90026fabaf74d7be0f9769cfbd654d823f03 Mon Sep 17 00:00:00 2001
From: Menghan Li <menghanl@google.com>
Date: Mon, 27 Jun 2016 12:00:22 -0700
Subject: [PATCH] Minor fixes

---
 server.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/server.go b/server.go
index 4bd8c7db..6782009e 100644
--- a/server.go
+++ b/server.go
@@ -82,7 +82,7 @@ type service struct {
 	server interface{} // the server for service methods
 	md     map[string]*MethodDesc
 	sd     map[string]*StreamDesc
-	meta   interface{}
+	mdata  interface{}
 }
 
 // Server is a gRPC server to serve RPC requests.
@@ -232,7 +232,7 @@ func (s *Server) register(sd *ServiceDesc, ss interface{}) {
 		server: ss,
 		md:     make(map[string]*MethodDesc),
 		sd:     make(map[string]*StreamDesc),
-		meta:   sd.Metadata,
+		mdata:  sd.Metadata,
 	}
 	for i := range sd.Methods {
 		d := &sd.Methods[i]
@@ -247,12 +247,14 @@ func (s *Server) register(sd *ServiceDesc, ss interface{}) {
 
 // ServiceInfo contains method names and metadata for a service.
 type ServiceInfo struct {
-	Methods  []string
+	// Methods are method names only, without the service name or package name.
+	Methods []string
+	// Metadata is the metadata specified in ServiceDesc when registering service.
 	Metadata interface{}
 }
 
-// GetServiceInfo returns a map from service name to ServiceInfo.
-// Service name includes the package name, in the form of <package>.<service>.
+// GetServiceInfo returns a map from service names to ServiceInfo.
+// Service names include the package names, in the form of <package>.<service>.
 func (s *Server) GetServiceInfo() map[string]*ServiceInfo {
 	ret := make(map[string]*ServiceInfo)
 	for n, srv := range s.m {
@@ -266,7 +268,7 @@ func (s *Server) GetServiceInfo() map[string]*ServiceInfo {
 
 		ret[n] = &ServiceInfo{
 			Methods:  methods,
-			Metadata: srv.meta,
+			Metadata: srv.mdata,
 		}
 	}
 	return ret