Skip to content

Add client instance to onconnect function #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjeffcaii merged 2 commits into from
Sep 27, 2020
Merged

Add client instance to onconnect function #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34c7441
Update client.go
kingljl Sep 27, 2020
9fed547
Update rsocket_test.go
kingljl Sep 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ type ClientBuilder interface {
// OnClose register handler when client socket closed.
OnClose(func(error)) ClientBuilder
// OnConnect register handler when client socket connected.
OnConnect(func(error)) ClientBuilder
OnConnect(func(Client,error)) ClientBuilder
// Acceptor set acceptor for RSocket client.
Acceptor(acceptor ClientSocketAcceptor) ToClientStarter
}
Expand Down Expand Up @@ -91,7 +91,7 @@ type clientBuilder struct {
setup *socket.SetupInfo
acceptor ClientSocketAcceptor
onCloses []func(error)
onConnects []func(error)
onConnects []func(Client,error)
connectTimeout time.Duration
}

Expand Down Expand Up @@ -119,7 +119,7 @@ func (cb *clientBuilder) Fragment(mtu int) ClientBuilder {
return cb
}

func (cb *clientBuilder) OnConnect(fn func(error)) ClientBuilder {
func (cb *clientBuilder) OnConnect(fn func(Client,error)) ClientBuilder {
cb.onConnects = append(cb.onConnects, fn)
return cb
}
Expand Down Expand Up @@ -215,11 +215,11 @@ func (cb *clientBuilder) Start(ctx context.Context) (client Client, err error) {

// trigger OnConnect
if len(cb.onConnects) > 0 {
var onConnects []func(error)
var onConnects []func(Client,error)
onConnects, cb.onConnects = cb.onConnects, nil
go func() {
for _, onConnect := range onConnects {
onConnect(err)
onConnect(client,err)
}
}()
}
Expand Down
2 changes: 1 addition & 1 deletion rsocket_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ func TestContextTimeout(t *testing.T) {

connected := make(chan bool)
cli, err := Connect().
OnConnect(func(err error) {
OnConnect(func(c Client,err error) {
connected <- err == nil
}).
ConnectTimeout(100 * time.Millisecond).
Expand Down