Skip to content

Commit

Permalink
update rpcx
Browse files Browse the repository at this point in the history
  • Loading branch information
chaoyuepan committed Dec 29, 2020
1 parent 09f5c0c commit c667bd6
Show file tree
Hide file tree
Showing 86 changed files with 174 additions and 882 deletions.
2 changes: 1 addition & 1 deletion 101basic/client/async/client_async.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var (
func main() {
flag.Parse()

d := client.NewPeer2PeerDiscovery("tcp@"+*addr2, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr2, "")
xclient := client.NewXClient("Arith", client.Failtry, client.RandomSelect, d, client.DefaultOption)
defer xclient.Close()

Expand Down
2 changes: 1 addition & 1 deletion 101basic/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var (
func main() {
flag.Parse()

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
xclient := client.NewXClient("Arith", client.Failtry, client.RandomSelect, d, client.DefaultOption)
defer xclient.Close()

Expand Down
2 changes: 1 addition & 1 deletion 102basic/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var (
func main() {
flag.Parse()

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
opt := client.DefaultOption
opt.SerializeType = protocol.JSON

Expand Down
2 changes: 1 addition & 1 deletion alias/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var (
func main() {
flag.Parse()

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")

option := client.DefaultOption

Expand Down
2 changes: 1 addition & 1 deletion auth/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var (
func main() {
flag.Parse()

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")

option := client.DefaultOption
option.IdleTimeout = 10 * time.Second
Expand Down
2 changes: 1 addition & 1 deletion bidirectional/client/xclient.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func main() {

ch := make(chan *protocol.Message)

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
xclient := client.NewBidirectionalXClient("Arith", client.Failtry, client.RandomSelect, d, client.DefaultOption, ch)
defer xclient.Close()

Expand Down
2 changes: 1 addition & 1 deletion blacklist/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func main() {
flag.Parse()

go http.ListenAndServe(":9099", nil)
d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
xclient = client.NewXClient("Arith", client.Failtry, client.RandomSelect, d, client.DefaultOption)
defer xclient.Close()

Expand Down
2 changes: 1 addition & 1 deletion breaker/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func main() {
// if failed 5 times, return error immediately, and will try to connect after 30 seconds
option.GenBreaker = func() client.Breaker { return client.NewConsecCircuitBreaker(5, 30*time.Second) }

d := client.NewMultipleServersDiscovery([]*client.KVPair{{Key: *addr1}, {Key: *addr2}})
d, _ := client.NewMultipleServersDiscovery([]*client.KVPair{{Key: *addr1}, {Key: *addr2}})
option.Retries = 10
xclient := client.NewXClient("Arith", client.Failfast, client.RandomSelect, d, option)
defer xclient.Close()
Expand Down
2 changes: 1 addition & 1 deletion broadcast/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var (
func main() {
flag.Parse()

d := client.NewMultipleServersDiscovery([]*client.KVPair{{Key: *addr1}, {Key: *addr2}})
d, _ := client.NewMultipleServersDiscovery([]*client.KVPair{{Key: *addr1}, {Key: *addr2}})
xclient := client.NewXClient("Arith", client.Failover, client.RoundRobin, d, client.DefaultOption)
defer xclient.Close()

Expand Down
2 changes: 1 addition & 1 deletion codec/gob/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func main() {
option := client.DefaultOption
option.SerializeType = protocol.SerializeType(4)

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
xclient := client.NewXClient("Arith", client.Failtry, client.RandomSelect, d, option)
defer xclient.Close()

Expand Down
2 changes: 1 addition & 1 deletion codec/iterator/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func main() {
option := client.DefaultOption
option.SerializeType = protocol.SerializeType(4)

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
xclient := client.NewXClient("Arith", client.Failtry, client.RandomSelect, d, option)
defer xclient.Close()

Expand Down
2 changes: 1 addition & 1 deletion codec/protobuf/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func main() {
option := client.DefaultOption
option.SerializeType = protocol.ProtoBuffer

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
xclient := client.NewXClient("Arith", client.Failtry, client.RandomSelect, d, option)
defer xclient.Close()

Expand Down
2 changes: 1 addition & 1 deletion compress/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var (
func main() {
flag.Parse()

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
option := client.DefaultOption
option.CompressType = protocol.Gzip

Expand Down
2 changes: 1 addition & 1 deletion docker/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var (
func main() {
flag.Parse()

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
xclient := client.NewXClient("Arith", client.Failtry, client.RandomSelect, d, client.DefaultOption)
defer xclient.Close()

Expand Down
2 changes: 1 addition & 1 deletion error/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var (
func main() {
flag.Parse()

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
xclient := client.NewXClient("Arith", client.Failtry, client.RandomSelect, d, client.DefaultOption)
defer xclient.Close()

Expand Down
2 changes: 1 addition & 1 deletion error/server/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ type Arith struct{}
// the second parameter is not a pointer
func (t *Arith) Mul(ctx context.Context, args example.Args, reply *example.Reply) error {

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
xclient := client.NewXClient("Arith", client.Failtry, client.RandomSelect, d, client.DefaultOption)
defer xclient.Close()

Expand Down
2 changes: 1 addition & 1 deletion failmode/failbackup/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var (
func main() {
flag.Parse()

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
xclient := client.NewXClient("Arith", client.Failbackup, client.RandomSelect, d, client.DefaultOption)
defer xclient.Close()

Expand Down
2 changes: 1 addition & 1 deletion failmode/failfast/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var (
func main() {
flag.Parse()

d := client.NewMultipleServersDiscovery([]*client.KVPair{{Key: *addr1}, {Key: *addr2}})
d, _ := client.NewMultipleServersDiscovery([]*client.KVPair{{Key: *addr1}, {Key: *addr2}})
option := client.DefaultOption
option.Retries = 10
xclient := client.NewXClient("Arith", client.Failfast, client.RandomSelect, d, option)
Expand Down
2 changes: 1 addition & 1 deletion failmode/failover/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var (
func main() {
flag.Parse()

d := client.NewMultipleServersDiscovery([]*client.KVPair{{Key: *addr1}, {Key: *addr2}})
d, _ := client.NewMultipleServersDiscovery([]*client.KVPair{{Key: *addr1}, {Key: *addr2}})
option := client.DefaultOption
option.Retries = 10
xclient := client.NewXClient("Arith", client.Failover, client.RandomSelect, d, option)
Expand Down
2 changes: 1 addition & 1 deletion failmode/failtry/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var (
func main() {
flag.Parse()

d := client.NewMultipleServersDiscovery([]*client.KVPair{{Key: *addr1}, {Key: *addr2}})
d, _ := client.NewMultipleServersDiscovery([]*client.KVPair{{Key: *addr1}, {Key: *addr2}})
option := client.DefaultOption
option.Retries = 10
xclient := client.NewXClient("Arith", client.Failtry, client.RandomSelect, d, option)
Expand Down
2 changes: 1 addition & 1 deletion file_download/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var (
func main() {
flag.Parse()

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
xclient := client.NewXClient(share.SendFileServiceName, client.Failtry, client.RandomSelect, d, client.DefaultOption)
defer xclient.Close()

Expand Down
2 changes: 1 addition & 1 deletion file_download/oneclient/oneclient.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var (
func main() {
flag.Parse()

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
oneClient := client.NewOneClient(client.Failtry, client.RandomSelect, d, client.DefaultOption)
defer oneClient.Close()

Expand Down
2 changes: 1 addition & 1 deletion filetransfer/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var (
func main() {
flag.Parse()

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
xclient := client.NewXClient(share.SendFileServiceName, client.Failtry, client.RandomSelect, d, client.DefaultOption)
defer xclient.Close()

Expand Down
2 changes: 1 addition & 1 deletion fork/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var (
func main() {
flag.Parse()

d := client.NewMultipleServersDiscovery([]*client.KVPair{{Key: *addr1}, {Key: *addr2}})
d, _ := client.NewMultipleServersDiscovery([]*client.KVPair{{Key: *addr1}, {Key: *addr2}})
xclient := client.NewXClient("Arith", client.Failover, client.RoundRobin, d, client.DefaultOption)
defer xclient.Close()

Expand Down
2 changes: 1 addition & 1 deletion function/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var (
func main() {
flag.Parse()

d := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
d, _ := client.NewPeer2PeerDiscovery("tcp@"+*addr, "")
xclient := client.NewXClient("a.fake.service", client.Failtry, client.RandomSelect, d, client.DefaultOption)
defer xclient.Close()

Expand Down
6 changes: 4 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ require (
github.com/nacos-group/nacos-sdk-go v1.0.1
github.com/opentracing/opentracing-go v1.2.0
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
github.com/rpcxio/rpcx-gateway v0.0.0-20200521025828-a39934d3752d
github.com/smallnest/rpcx v0.0.0-20201223122003-ca98a3ecb90c
github.com/smallnest/rpcx v0.0.0-20201229103109-20b35e5375d1
github.com/templexxx/cpufeat v0.0.0-20180720151539-5901679d5808 // indirect
github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect
github.com/tjfoc/gmsm v1.3.2 // indirect
github.com/xtaci/kcp-go v5.4.20+incompatible
golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c
)
Loading

0 comments on commit c667bd6

Please sign in to comment.