summaryrefslogtreecommitdiff
path: root/internal/ssh/client/hostkeycallback.go
diff options
context:
space:
mode:
authorPaul Bütow <pbuetow@mimecast.com>2020-01-26 11:26:53 +0000
committerPaul Bütow <pbuetow@mimecast.com>2020-02-07 13:31:15 +0000
commit0945da8dfefcbb723eecea0e5f4eafff63398253 (patch)
treef06dab4d2bf21d25d176b23d5baeca588d27f5d7 /internal/ssh/client/hostkeycallback.go
parent2a8e5de265a0e0a31a5834909d6879f5c9941467 (diff)
Introduce drun command, refactor code to use context package
Diffstat (limited to 'internal/ssh/client/hostkeycallback.go')
-rw-r--r--internal/ssh/client/hostkeycallback.go10
1 files changed, 6 insertions, 4 deletions
diff --git a/internal/ssh/client/hostkeycallback.go b/internal/ssh/client/hostkeycallback.go
index 4023e59..7ae2396 100644
--- a/internal/ssh/client/hostkeycallback.go
+++ b/internal/ssh/client/hostkeycallback.go
@@ -2,8 +2,7 @@ package client
import (
"bufio"
- "github.com/mimecast/dtail/internal/logger"
- "github.com/mimecast/dtail/internal/prompt"
+ "context"
"fmt"
"net"
"os"
@@ -11,6 +10,9 @@ import (
"sync"
"time"
+ "github.com/mimecast/dtail/internal/io/logger"
+ "github.com/mimecast/dtail/internal/prompt"
+
"golang.org/x/crypto/ssh"
"golang.org/x/crypto/ssh/knownhosts"
)
@@ -116,7 +118,7 @@ func (h *HostKeyCallback) Wrap() ssh.HostKeyCallback {
// PromptAddHosts prompts a question to the user whether unknown hosts should
// be added to the known hosts or not.
-func (h *HostKeyCallback) PromptAddHosts(stop <-chan struct{}) {
+func (h *HostKeyCallback) PromptAddHosts(ctx context.Context) {
var hosts []unknownHost
for {
@@ -135,7 +137,7 @@ func (h *HostKeyCallback) PromptAddHosts(stop <-chan struct{}) {
h.promptAddHosts(hosts)
hosts = []unknownHost{}
}
- case <-stop:
+ case <-ctx.Done():
logger.Debug("Stopping goroutine prompting new hosts...")
return
}