add a dialer timeout and more logging

keybase · Dec 4, 2017 · 14c0a0f · 14c0a0f
1 parent a8a1522
commit 14c0a0f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/libkbfs/mdserver_remote.go b/libkbfs/mdserver_remote.go
@@ -82,6 +82,8 @@ var _ kbfscrypto.AuthTokenRefreshHandler = (*MDServerRemote)(nil)
 // Test that MDServerRemote fully implements the ConnectionHandler interface.
 var _ rpc.ConnectionHandler = (*MDServerRemote)(nil)
 
+const dialerTimeout = 16 * time.Second
+
 // NewMDServerRemote returns a new instance of MDServerRemote.
 func NewMDServerRemote(config Config, srvRemote rpc.Remote,
 	rpcLogFactory rpc.LogFactory) *MDServerRemote {
@@ -112,6 +114,7 @@ func NewMDServerRemote(config Config, srvRemote rpc.Remote,
 		WrapErrorFunc:    libkb.WrapError,
 		TagsFunc:         libkb.LogTagsFromContext,
 		ReconnectBackoff: func() backoff.BackOff { return constBackoff },
+		DialerTimeout:    dialerTimeout,
 
 		InitialReconnectBackoffWindow: mdserverReconnectBackoffWindow,
 	}

diff --git a/vendor/github.com/keybase/go-framed-msgpack-rpc/rpc/connection.go b/vendor/github.com/keybase/go-framed-msgpack-rpc/rpc/connection.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -353,10 +353,10 @@
 			"revisionTime": "2016-12-08T01:54:25Z"
 		},
 		{
-			"checksumSHA1": "ooOAFqhSNU9F4g6eylg4S8C+4vI=",
+			"checksumSHA1": "2coH3or2TjH+4j2KCnfHlToMir8=",
 			"path": "github.com/keybase/go-framed-msgpack-rpc/rpc",
-			"revision": "c2b38e1451d0222932cc8fa20456a145e0342240",
-			"revisionTime": "2017-12-01T22:02:51Z"
+			"revision": "375cb8d53f23800421ccff862afad54905ddf580",
+			"revisionTime": "2017-12-04T02:34:24Z"
 		},
 		{
 			"checksumSHA1": "RLs8GIV4e+D350pyzZh5RC3mgQg=",