Skip to content

Commit 00487dc

Browse files
committed
No more nested vendor
1 parent a014e7f commit 00487dc

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

ssh/client/ssh/ssh.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"path/filepath"
1111
"strings"
1212
"sync"
13-
"time"
1413

1514
log "github.com/inconshreveable/log15"
1615

@@ -190,21 +189,18 @@ func (client *Client) StartTunnel(localPort uint16, addr string) error {
190189
sess, err := localListener.Accept()
191190
if err != nil {
192191
log.Debug("Error accepting tunnel listener: ", err)
193-
time.Sleep(time.Second)
194192
continue
195193
}
196194

197195
stream, err := sess.AcceptStream()
198196
if err != nil {
199197
log.Debug("Error accepting tunnel listener session: ", err)
200-
time.Sleep(time.Second)
201198
continue
202199
}
203200

204201
err = client.forward(addr, &quicconn.QuicConn{Session: sess, Stream: stream})
205202
if err != nil {
206203
log.Debug("Error forwarding connection: ", err)
207-
time.Sleep(time.Second)
208204
continue
209205
}
210206
}
@@ -221,14 +217,12 @@ func (client *Client) StartTunnel(localPort uint16, addr string) error {
221217
localConn, err := localListener.Accept()
222218
if err != nil {
223219
log.Debug("Error accepting tunnel listener: ", err)
224-
time.Sleep(time.Second)
225220
continue
226221
}
227222

228223
err = client.forward(addr, localConn)
229224
if err != nil {
230225
log.Debug("Error forwarding connection: ", err)
231-
time.Sleep(time.Second)
232226
continue
233227
}
234228
}

vendor/vendor.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
"package": [
55
{
66
"checksumSHA1": "9NFR6RG8H2fNyKHscGmuGLQhRm4=",
7-
"origin": "github.com/docker/docker/vendor/github.com/Azure/go-ansiterm",
87
"path": "github.com/Azure/go-ansiterm",
98
"revision": "3cd54c28fd7281f995d134d2e0d74582a90b2f14",
109
"revisionTime": "2019-04-25T00:25:05Z"
1110
},
1211
{
1312
"checksumSHA1": "3/UphB+6Hbx5otA4PjFjvObT+L4=",
14-
"origin": "github.com/docker/docker/vendor/github.com/Azure/go-ansiterm/winterm",
1513
"path": "github.com/Azure/go-ansiterm/winterm",
1614
"revision": "3cd54c28fd7281f995d134d2e0d74582a90b2f14",
1715
"revisionTime": "2019-04-25T00:25:05Z"
@@ -231,7 +229,6 @@
231229
},
232230
{
233231
"checksumSHA1": "uKoo85DVwvdZLliXjWmHuOoof5M=",
234-
"origin": "github.com/docker/docker/vendor/github.com/konsorten/go-windows-terminal-sequences",
235232
"path": "github.com/konsorten/go-windows-terminal-sequences",
236233
"revision": "3cd54c28fd7281f995d134d2e0d74582a90b2f14",
237234
"revisionTime": "2019-04-25T00:25:05Z"
@@ -662,7 +659,6 @@
662659
},
663660
{
664661
"checksumSHA1": "Tx+N13P+lGKgx5LXb2FcNkezzvU=",
665-
"origin": "github.com/docker/docker/vendor/github.com/sirupsen/logrus",
666662
"path": "github.com/sirupsen/logrus",
667663
"revision": "3cd54c28fd7281f995d134d2e0d74582a90b2f14",
668664
"revisionTime": "2019-04-25T00:25:05Z"

0 commit comments

Comments
 (0)