@@ -3,34 +3,20 @@ package xetcd
33import (
44 "context"
55 "fmt"
6+ "github.com/coder2z/g-saber/xtime"
67 "github.com/coder2z/g-server/xgrpc"
78 xbalancer "github.com/coder2z/g-server/xgrpc/balancer"
89 "github.com/coder2z/g-server/xgrpc/balancer/least_connection"
910 clientinterceptors "github.com/coder2z/g-server/xgrpc/client"
1011 serverinterceptors "github.com/coder2z/g-server/xgrpc/server"
1112 "github.com/coder2z/g-server/xregistry"
12- "github.com/coder2z/g-saber/xlog"
13- "github.com/coder2z/g-saber/xtime"
14- proto "github.com/grpc-ecosystem/go-grpc-prometheus/examples/grpc-server-with-prometheus/protobuf"
1513 "google.golang.org/grpc"
1614 "google.golang.org/grpc/metadata"
17- "log"
1815 "net"
1916 "testing"
2017 "time"
2118)
2219
23- type server struct {
24- add string
25- }
26-
27- func (s server ) SayHello (c context.Context , request * proto.HelloRequest ) (* proto.HelloResponse , error ) {
28- text := "Hello " + request .Name + ", I am " + s .add
29- log .Println (text )
30-
31- return & proto.HelloResponse {Message : text }, nil
32- }
33-
3420func TestEtcd (t * testing.T ) {
3521
3622 conf := EtcdV3Cfg {
@@ -65,7 +51,6 @@ func TestEtcd(t *testing.T) {
6551 }
6652 serve := grpc .NewServer (options ... )
6753 listener , err := net .Listen ("tcp" , ":8888" )
68- proto .RegisterDemoServiceServer (serve , server {add : ":8888" })
6954 _ = serve .Serve (listener )
7055}
7156
@@ -105,7 +90,6 @@ func TestEtcd2(t *testing.T) {
10590 )
10691
10792 listener , err := net .Listen ("tcp" , ":7777" )
108- proto .RegisterDemoServiceServer (serve , server {add : ":7777" })
10993 _ = serve .Serve (listener )
11094}
11195
@@ -142,19 +126,4 @@ func TestEtcdDiscovery(t *testing.T) {
142126 return
143127 }
144128 defer conn .Close ()
145- client := proto .NewDemoServiceClient (conn )
146- for i := 0 ; i < 100 ; i ++ {
147- ctx := context .Background ()
148- resp , err := client .SayHello (ctx ,
149- & proto.HelloRequest {
150- Name : "123" ,
151- })
152- if err != nil {
153- xlog .Error ("error" , xlog .FieldErr (err ))
154- time .Sleep (time .Second )
155- continue
156- }
157- xlog .Info ("success" , xlog .String ("msg" , resp .GetMessage ()))
158- time .Sleep (time .Second )
159- }
160129}
0 commit comments