fix regex bug

7 files changed, 33 insertions, 20 deletions

diff --git a/internal/clients/baseclient.go b/internal/clients/baseclient.go
index 102fd7c..ba18f95 100644
--- a/internal/clients/baseclient.go
+++ b/internal/clients/baseclient.go
@@ -38,18 +38,9 @@ type baseClient struct {
 	Regex regex.Regex
 }
 
-func (c *baseClient) init(maker maker) {
+func (c *baseClient) init() {
 	logger.Info("Initiating base client")
 
-	c.maker = maker
-	c.sshAuthMethods, c.hostKeyCallback = client.InitSSHAuthMethods(c.Args.SSHAuthMethods, c.Args.SSHHostKeyCallback, c.Args.TrustAllHosts, c.throttleCh, c.Args.PrivateKeyPathFile)
-
-	discoveryService := discovery.New(c.Discovery, c.ServersStr, discovery.Shuffle)
-
-	for _, server := range discoveryService.ServerList() {
-		c.connections = append(c.connections, c.makeConnection(server, c.sshAuthMethods, c.hostKeyCallback))
-	}
-
 	flag := regex.Default
 	if c.Args.RegexInvert {
 		flag = regex.Invert
@@ -59,6 +50,18 @@ func (c *baseClient) init(maker maker) {
 		logger.FatalExit(c.Regex, "invalid regex!", err, regex)
 	}
 	c.Regex = regex
+	logger.Debug("Regex", c.Regex)
+
+	c.sshAuthMethods, c.hostKeyCallback = client.InitSSHAuthMethods(c.Args.SSHAuthMethods, c.Args.SSHHostKeyCallback, c.Args.TrustAllHosts, c.throttleCh, c.Args.PrivateKeyPathFile)
+}
+
+func (c *baseClient) makeConnections(maker maker) {
+	c.maker = maker
+
+	discoveryService := discovery.New(c.Discovery, c.ServersStr, discovery.Shuffle)
+	for _, server := range discoveryService.ServerList() {
+		c.connections = append(c.connections, c.makeConnection(server, c.sshAuthMethods, c.hostKeyCallback))
+	}
 
 	c.stats = newTailStats(len(c.connections))
 }
diff --git a/internal/clients/catclient.go b/internal/clients/catclient.go
index f089e32..d8e9196 100644
--- a/internal/clients/catclient.go
+++ b/internal/clients/catclient.go
@@ -31,7 +31,8 @@ func NewCatClient(args Args) (*CatClient, error) {
 		},
 	}
 
-	c.init(c)
+	c.init()
+	c.makeConnections(c)
 
 	return &c, nil
 }
@@ -42,7 +43,7 @@ func (c CatClient) makeHandler(server string) handlers.Handler {
 
 func (c CatClient) makeCommands() (commands []string) {
 	for _, file := range strings.Split(c.What, ",") {
-		commands = append(commands, fmt.Sprintf("%s %s regex %s", c.Mode.String(), file, c.Regex))
+		commands = append(commands, fmt.Sprintf("%s %s %s", c.Mode.String(), file, c.Regex.Serialize()))
 	}
 	return
 }
diff --git a/internal/clients/grepclient.go b/internal/clients/grepclient.go
index 9f6b666..4024083 100644
--- a/internal/clients/grepclient.go
+++ b/internal/clients/grepclient.go
@@ -30,7 +30,8 @@ func NewGrepClient(args Args) (*GrepClient, error) {
 		},
 	}
 
-	c.init(c)
+	c.init()
+	c.makeConnections(c)
 
 	return &c, nil
 }
diff --git a/internal/clients/maker.go b/internal/clients/maker.go
index da9dfc9..1ba6482 100644
--- a/internal/clients/maker.go
+++ b/internal/clients/maker.go
@@ -1,6 +1,8 @@
 package clients
 
-import "github.com/mimecast/dtail/internal/clients/handlers"
+import (
+	"github.com/mimecast/dtail/internal/clients/handlers"
+)
 
 type maker interface {
 	makeHandler(server string) handlers.Handler
diff --git a/internal/clients/maprclient.go b/internal/clients/maprclient.go
index 85fa7ee..d154c9d 100644
--- a/internal/clients/maprclient.go
+++ b/internal/clients/maprclient.go
@@ -87,7 +87,8 @@ func NewMaprClient(args Args, queryStr string, maprClientMode MaprClientMode) (*
 	}
 
 	c.globalGroup = mapr.NewGlobalGroupSet()
-	c.baseClient.init(c)
+	c.baseClient.init()
+	c.baseClient.makeConnections(c)
 
 	return &c, nil
 }
@@ -119,10 +120,10 @@ func (c MaprClient) makeCommands() (commands []string) {
 
 	for _, file := range strings.Split(c.What, ",") {
 		if c.Timeout > 0 {
-			commands = append(commands, fmt.Sprintf("timeout %d %s %s regex %s", c.Timeout, modeStr, file, c.Regex))
+			commands = append(commands, fmt.Sprintf("timeout %d %s %s %s", c.Timeout, modeStr, file, c.Regex.Serialize()))
 			continue
 		}
-		commands = append(commands, fmt.Sprintf("%s %s regex %s", modeStr, file, c.Regex))
+		commands = append(commands, fmt.Sprintf("%s %s regex %s", modeStr, file, c.Regex.Serialize()))
 	}
 
 	return
diff --git a/internal/clients/runclient.go b/internal/clients/runclient.go
index 9f8e478..5464d54 100644
--- a/internal/clients/runclient.go
+++ b/internal/clients/runclient.go
@@ -38,7 +38,9 @@ func NewRunClient(args Args, background, jobName string) (*RunClient, error) {
 		background: background,
 	}
 
-	c.init(c)
+	c.init()
+	c.makeConnections(c)
+
 	return &c, nil
 }
 
diff --git a/internal/clients/tailclient.go b/internal/clients/tailclient.go
index 15e77cc..53b5ba4 100644
--- a/internal/clients/tailclient.go
+++ b/internal/clients/tailclient.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/mimecast/dtail/internal/clients/handlers"
+	"github.com/mimecast/dtail/internal/io/logger"
 	"github.com/mimecast/dtail/internal/omode"
 )
 
@@ -26,7 +27,8 @@ func NewTailClient(args Args) (*TailClient, error) {
 		},
 	}
 
-	c.init(c)
+	c.init()
+	c.makeConnections(c)
 	return &c, nil
 }
 
@@ -36,8 +38,9 @@ func (c TailClient) makeHandler(server string) handlers.Handler {
 
 func (c TailClient) makeCommands() (commands []string) {
 	for _, file := range strings.Split(c.What, ",") {
-		commands = append(commands, fmt.Sprintf("%s %s regex %s", c.Mode.String(), file, c.Regex))
+		commands = append(commands, fmt.Sprintf("%s %s %s", c.Mode.String(), file, c.Regex.Serialize()))
 	}
+	logger.Debug(commands)
 
 	return
 }