Introduce drun command, refactor code to use context package

3 files changed, 17 insertions, 8 deletions

diff --git a/internal/discovery/comma.go b/internal/discovery/comma.go
index ad18be0..94276c7 100644
--- a/internal/discovery/comma.go
+++ b/internal/discovery/comma.go
@@ -1,7 +1,7 @@
 package discovery
 
 import (
-	"github.com/mimecast/dtail/internal/logger"
+	"github.com/mimecast/dtail/internal/io/logger"
 	"strings"
 )
 
diff --git a/internal/discovery/discovery.go b/internal/discovery/discovery.go
index d76c1b2..1090ea9 100644
--- a/internal/discovery/discovery.go
+++ b/internal/discovery/discovery.go
@@ -1,7 +1,6 @@
 package discovery
 
 import (
-	"github.com/mimecast/dtail/internal/logger"
 	"fmt"
 	"math/rand"
 	"os"
@@ -9,6 +8,16 @@ import (
 	"regexp"
 	"strings"
 	"time"
+
+	"github.com/mimecast/dtail/internal/io/logger"
+)
+
+// ServerOrder to specify how to sort the server list.
+type ServerOrder int
+
+const (
+	// Shuffle the server list?
+	Shuffle ServerOrder = iota
 )
 
 // Discovery method for discovering a list of available DTail servers.
@@ -21,12 +30,12 @@ type Discovery struct {
 	server string
 	// To filter server list.
 	regex *regexp.Regexp
-	// To shuffle resulting server list.
-	shuffle bool
+	// How to order the server list.
+	order ServerOrder
 }
 
 // New returns a new discovery method.
-func New(method, server string, shuffle bool) *Discovery {
+func New(method, server string, order ServerOrder) *Discovery {
 	module := method
 	options := ""
 
@@ -43,7 +52,7 @@ func New(method, server string, shuffle bool) *Discovery {
 		module:  strings.ToUpper(module),
 		options: options,
 		server:  server,
-		shuffle: shuffle,
+		order:   order,
 	}
 
 	if strings.HasPrefix(server, "/") && strings.HasSuffix(server, "/") {
@@ -84,7 +93,7 @@ func (d *Discovery) ServerList() []string {
 
 	servers = d.dedupList(servers)
 
-	if d.shuffle {
+	if d.order == Shuffle {
 		servers = d.shuffleList(servers)
 	}
 
diff --git a/internal/discovery/file.go b/internal/discovery/file.go
index 2edc867..c04173e 100644
--- a/internal/discovery/file.go
+++ b/internal/discovery/file.go
@@ -2,7 +2,7 @@ package discovery
 
 import (
 	"bufio"
-	"github.com/mimecast/dtail/internal/logger"
+	"github.com/mimecast/dtail/internal/io/logger"
 	"os"
 )