fixing rpc server, example nyt & updating rpc example client

nytimes · Mar 19, 2016 · f5b781a · f5b781a
1 parent fbee99c
commit f5b781a
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 69 deletions.
diff --git a/examples/nyt/client.go b/examples/nyt/client.go
@@ -40,7 +40,7 @@ func (c *ClientImpl) GetMostPopular(resourceType string, section string, timePer
 	}
 
 	err = json.Unmarshal(rawRes, &res)
-	return res.Result, err
+	return res.Results, err
 }
 
 func (c *ClientImpl) SemanticConceptSearch(conceptType, concept string) ([]*SemanticConceptArticle, error) {
@@ -58,11 +58,11 @@ func (c *ClientImpl) SemanticConceptSearch(conceptType, concept string) ([]*Sema
 	}
 
 	err = json.Unmarshal(rawRes, &res)
-	if len(res.Result) == 0 {
+	if len(res.Results) == 0 {
 		return nil, errors.New("no results")
 	}
 
-	return res.Result[0].ArticleList.Result, nil
+	return res.Results[0].ArticleList.Results, nil
 }
 
 func (c *ClientImpl) do(uri string) (body []byte, err error) {

diff --git a/examples/nyt/mostpopular.pb.go b/examples/nyt/mostpopular.pb.go
diff --git a/examples/nyt/mostpopular.proto b/examples/nyt/mostpopular.proto
@@ -6,7 +6,7 @@ message MostPopularResponse  {
     string status = 1;
     string copyright = 2;
     uint32 num_results = 3;
-    repeated MostPopularResult result = 4;
+    repeated MostPopularResult results = 4;
 }
 
 message MostPopularResult  {

diff --git a/examples/nyt/semanticconcept.pb.go b/examples/nyt/semanticconcept.pb.go
diff --git a/examples/nyt/semanticconcept.proto b/examples/nyt/semanticconcept.proto
@@ -6,15 +6,15 @@ message SemanticConceptResponse  {
     string status = 1;
     string copyright = 2;
     uint32 num_results = 3;
-    repeated SemanticConceptResult result = 4;
+    repeated SemanticConceptResult results = 4;
 }
 
 message SemanticConceptResult {
     SemanticConceptArticleList article_list = 1;
 }
 
 message SemanticConceptArticleList {
-    repeated SemanticConceptArticle result = 1;
+    repeated SemanticConceptArticle results = 1;
     uint32 total = 2;
 }
 

diff --git a/examples/servers/rpc/client/main.go b/examples/servers/rpc/client/main.go
@@ -23,7 +23,7 @@ var (
 )
 
 func main() {
-	conn, err := grpc.Dial(*serverAddr)
+	conn, err := grpc.Dial(*serverAddr, grpc.WithInsecure())
 	if err != nil {
 		grpclog.Fatalf("fail to dial: %v", err)
 	}

diff --git a/server/rpc_server.go b/server/rpc_server.go
@@ -109,7 +109,7 @@ func (r *RPCServer) Start() error {
 		return err
 	}
 
-	func() {
+	go func() {
 		if err := r.srvr.Serve(rl); err != nil {
 			Log.Error("encountered an error while serving RPC listener: ", err)
 		}
@@ -130,8 +130,8 @@ func (r *RPCServer) Start() error {
 		return err
 	}
 
-	func() {
-		if err := srv.Serve(rl); err != nil {
+	go func() {
+		if err := srv.Serve(hl); err != nil {
 			Log.Error("encountered an error while serving listener: ", err)
 		}
 	}()