From 0945da8dfefcbb723eecea0e5f4eafff63398253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20B=C3=BCtow?= <pbuetow@mimecast.com>
Date: Sun, 26 Jan 2020 11:26:53 +0000
Subject: Introduce drun command, refactor code to use context package

---
 internal/ssh/client/authmethods.go       |  2 +-
 internal/ssh/client/hostkeycallback.go   | 10 ++++++----
 internal/ssh/server/hostkey.go           |  2 +-
 internal/ssh/server/publickeycallback.go |  2 +-
 internal/ssh/ssh.go                      |  2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'internal/ssh')

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
 		}
diff --git a/internal/ssh/server/hostkey.go b/internal/ssh/server/hostkey.go
index 7baa4aa..07790ad 100644
--- a/internal/ssh/server/hostkey.go
+++ b/internal/ssh/server/hostkey.go
@@ -2,7 +2,7 @@ package server
 
 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"
 	"io/ioutil"
 	"os"
diff --git a/internal/ssh/server/publickeycallback.go b/internal/ssh/server/publickeycallback.go
index c6929d7..757def7 100644
--- a/internal/ssh/server/publickeycallback.go
+++ b/internal/ssh/server/publickeycallback.go
@@ -7,7 +7,7 @@ import (
 	osUser "os/user"
 
 	"github.com/mimecast/dtail/internal/config"
-	"github.com/mimecast/dtail/internal/logger"
+	"github.com/mimecast/dtail/internal/io/logger"
 	user "github.com/mimecast/dtail/internal/user/server"
 
 	gossh "golang.org/x/crypto/ssh"
diff --git a/internal/ssh/ssh.go b/internal/ssh/ssh.go
index 77cc341..3a2e416 100644
--- a/internal/ssh/ssh.go
+++ b/internal/ssh/ssh.go
@@ -4,9 +4,9 @@ import (
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"
-	"github.com/mimecast/dtail/internal/logger"
 	"encoding/pem"
 	"fmt"
+	"github.com/mimecast/dtail/internal/io/logger"
 	"io/ioutil"
 	"net"
 	"os"
-- 
cgit v1.2.3