Skip to content
This repository was archived by the owner on Feb 12, 2019. It is now read-only.

rpc connection handler callbacks now passes in context #183

Closed
jinyangli wants to merge 1 commit into from
Closed

rpc connection handler callbacks now passes in context #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions libkbfs/bserver_remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ func (b *BlockServerRemote) RefreshAuthToken(ctx context.Context) {
}

// OnConnectError implements the ConnectionHandler interface.
func (b *BlockServerRemote) OnConnectError(err error, wait time.Duration) {
b.log.Warning("connection error: %v; retrying in %s",
func (b *BlockServerRemote) OnConnectError(ctx context.Context, err error, wait time.Duration) {
b.deferLog.CWarningf(ctx, "connection error: %v; retrying in %s",
err, wait)
if b.authToken != nil {
b.authToken.Shutdown()
Expand All @@ -140,8 +140,8 @@ func (b *BlockServerRemote) OnConnectError(err error, wait time.Duration) {
}

// OnDoCommandError implements the ConnectionHandler interface.
func (b *BlockServerRemote) OnDoCommandError(err error, wait time.Duration) {
b.log.Warning("DoCommand error: %v; retrying in %s",
func (b *BlockServerRemote) OnDoCommandError(ctx context.Context, err error, wait time.Duration) {
b.deferLog.CWarningf(ctx, "DoCommand error: %v; retrying in %s",
err, wait)
}

Expand All @@ -157,7 +157,7 @@ func (b *BlockServerRemote) OnDisconnected(ctx context.Context,
}

// ShouldRetry implements the ConnectionHandler interface.
func (b *BlockServerRemote) ShouldRetry(rpcName string, err error) bool {
func (b *BlockServerRemote) ShouldRetry(_ context.Context, rpcName string, err error) bool {
//do not let connection.go's DoCommand retry any batch rpcs automatically
//because i will manually retry them without successfully completed references
switch rpcName {
Expand All @@ -178,7 +178,7 @@ func (b *BlockServerRemote) ShouldRetry(rpcName string, err error) bool {
}

// ShouldRetryOnConnect implements the ConnectionHandler interface.
func (b *BlockServerRemote) ShouldRetryOnConnect(err error) bool {
func (b *BlockServerRemote) ShouldRetryOnConnect(_ context.Context, err error) bool {
_, inputCanceled := err.(libkb.InputCanceledError)
return !inputCanceled
}
Expand Down
12 changes: 6 additions & 6 deletions libkbfs/crypto_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ func (c *CryptoClient) OnConnect(ctx context.Context, conn *rpc.Connection,
}

// OnConnectError implements the ConnectionHandler interface.
func (c *CryptoClient) OnConnectError(err error, wait time.Duration) {
c.log.Warning("CryptoClient: connection error: %q; retrying in %s",
func (c *CryptoClient) OnConnectError(ctx context.Context, err error, wait time.Duration) {
c.log.CWarningf(ctx, "CryptoClient: connection error: %q; retrying in %s",
err, wait)
c.config.KBFSOps().PushConnectionStatusChange(KeybaseServiceName, err)
}

// OnDoCommandError implements the ConnectionHandler interface.
func (c *CryptoClient) OnDoCommandError(err error, wait time.Duration) {
c.log.Warning("CryptoClient: docommand error: %q; retrying in %s",
func (c *CryptoClient) OnDoCommandError(ctx context.Context, err error, wait time.Duration) {
c.log.CWarningf(ctx, "CryptoClient: docommand error: %q; retrying in %s",
err, wait)
c.config.KBFSOps().PushConnectionStatusChange(KeybaseServiceName, err)
}
Expand All @@ -89,12 +89,12 @@ func (c *CryptoClient) OnDisconnected(_ context.Context,
}

// ShouldRetry implements the ConnectionHandler interface.
func (c *CryptoClient) ShouldRetry(rpcName string, err error) bool {
func (c *CryptoClient) ShouldRetry(_ context.Context, rpcName string, err error) bool {
return false
}

// ShouldRetryOnConnect implements the ConnectionHandler interface.
func (c *CryptoClient) ShouldRetryOnConnect(err error) bool {
func (c *CryptoClient) ShouldRetryOnConnect(_ context.Context, err error) bool {
_, inputCanceled := err.(libkb.InputCanceledError)
return !inputCanceled
}
Expand Down
12 changes: 6 additions & 6 deletions libkbfs/keybase_daemon_rpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,14 +482,14 @@ func (k *KeybaseDaemonRPC) OnConnect(ctx context.Context,
}

// OnConnectError implements the ConnectionHandler interface.
func (k *KeybaseDaemonRPC) OnConnectError(err error, wait time.Duration) {
k.log.Warning("KeybaseDaemonRPC: connection error: %q; retrying in %s",
func (k *KeybaseDaemonRPC) OnConnectError(ctx context.Context, err error, wait time.Duration) {
k.log.CWarningf(ctx, "KeybaseDaemonRPC: connection error: %q; retrying in %s",
err, wait)
}

// OnDoCommandError implements the ConnectionHandler interface.
func (k *KeybaseDaemonRPC) OnDoCommandError(err error, wait time.Duration) {
k.log.Warning("KeybaseDaemonRPC: docommand error: %q; retrying in %s",
func (k *KeybaseDaemonRPC) OnDoCommandError(ctx context.Context, err error, wait time.Duration) {
k.log.CWarningf(ctx, "KeybaseDaemonRPC: docommand error: %q; retrying in %s",
err, wait)
}

Expand All @@ -504,12 +504,12 @@ func (k *KeybaseDaemonRPC) OnDisconnected(_ context.Context,
}

// ShouldRetry implements the ConnectionHandler interface.
func (k *KeybaseDaemonRPC) ShouldRetry(rpcName string, err error) bool {
func (k *KeybaseDaemonRPC) ShouldRetry(_ context.Context, rpcName string, err error) bool {
return false
}

// ShouldRetryOnConnect implements the ConnectionHandler interface.
func (k *KeybaseDaemonRPC) ShouldRetryOnConnect(err error) bool {
func (k *KeybaseDaemonRPC) ShouldRetryOnConnect(_ context.Context, err error) bool {
_, inputCanceled := err.(libkb.InputCanceledError)
return !inputCanceled
}
Expand Down
14 changes: 7 additions & 7 deletions libkbfs/mdserver_remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@ func (md *MDServerRemote) resetPingTicker(intervalSeconds int) {
}

// OnConnectError implements the ConnectionHandler interface.
func (md *MDServerRemote) OnConnectError(err error, wait time.Duration) {
md.log.Warning("MDServerRemote: connection error: %q; retrying in %s",
func (md *MDServerRemote) OnConnectError(ctx context.Context, err error, wait time.Duration) {
md.log.CWarningf(ctx, "MDServerRemote: connection error: %q; retrying in %s",
err, wait)
// TODO: it might make sense to show something to the user if this is
// due to authentication, for example.
Expand All @@ -271,16 +271,16 @@ func (md *MDServerRemote) OnConnectError(err error, wait time.Duration) {
}

// OnDoCommandError implements the ConnectionHandler interface.
func (md *MDServerRemote) OnDoCommandError(err error, wait time.Duration) {
md.log.Warning("MDServerRemote: DoCommand error: %q; retrying in %s",
func (md *MDServerRemote) OnDoCommandError(ctx context.Context, err error, wait time.Duration) {
md.log.CWarningf(ctx, "MDServerRemote: DoCommand error: %q; retrying in %s",
err, wait)
md.config.KBFSOps().PushConnectionStatusChange(MDServiceName, err)
}

// OnDisconnected implements the ConnectionHandler interface.
func (md *MDServerRemote) OnDisconnected(ctx context.Context,
status rpc.DisconnectStatus) {
md.log.Warning("MDServerRemote is disconnected: %v", status)
md.log.CWarningf(ctx, "MDServerRemote is disconnected: %v", status)
md.config.Reporter().Notify(ctx,
connectionNotification(connectionStatusDisconnected))
md.cancelObservers()
Expand All @@ -297,13 +297,13 @@ func (md *MDServerRemote) OnDisconnected(ctx context.Context,
}

// ShouldRetry implements the ConnectionHandler interface.
func (md *MDServerRemote) ShouldRetry(name string, err error) bool {
func (md *MDServerRemote) ShouldRetry(_ context.Context, name string, err error) bool {
_, shouldThrottle := err.(MDServerErrorThrottle)
return shouldThrottle
}

// ShouldRetryOnConnect implements the ConnectionHandler interface.
func (md *MDServerRemote) ShouldRetryOnConnect(err error) bool {
func (md *MDServerRemote) ShouldRetryOnConnect(_ context.Context, err error) bool {
_, inputCanceled := err.(libkb.InputCanceledError)
return !inputCanceled
}
Expand Down
24 changes: 14 additions & 10 deletions vendor/github.com/keybase/go-framed-msgpack-rpc/connection.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions vendor/github.com/keybase/go-framed-msgpack-rpc/connection_test_util.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions vendor/vendor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,10 @@
"revisionTime": "2016-03-16T16:25:20-04:00"
},
{
"checksumSHA1": "Ao/ZFbwpEQ2kdtaim/5borAcVKE=",
"checksumSHA1": "1ccp9ziBK9qn9myFVRCz2vdX5CI=",
"path": "github.com/keybase/go-framed-msgpack-rpc",
"revision": "090895b12240aa18b8d6a759a2638f0c1065c7d0",
"revisionTime": "2016-06-15T10:04:14-04:00"
"revision": "653f4395fad769c9475a626ea8c29bf87af46c36",
"revisionTime": "2016-06-06T15:02:16Z"
},
{
"path": "github.com/keybase/go-jsonw",
Expand Down