diff options
Diffstat (limited to 'internal/ssh/client')
| -rw-r--r-- | internal/ssh/client/authmethods.go | 2 | ||||
| -rw-r--r-- | internal/ssh/client/hostkeycallback.go | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/internal/ssh/client/authmethods.go b/internal/ssh/client/authmethods.go index 3392eb1..967866f 100644 --- a/internal/ssh/client/authmethods.go +++ b/internal/ssh/client/authmethods.go @@ -2,7 +2,7 @@ package client import ( "github.com/mimecast/dtail/internal/config" - "github.com/mimecast/dtail/internal/logger" + "github.com/mimecast/dtail/internal/io/logger" "github.com/mimecast/dtail/internal/ssh" "os" 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 } |