summaryrefslogtreecommitdiff
path: root/internal/clients/baseclient.go
diff options
context:
space:
mode:
authorPaul Buetow <pbuetow@mimecast.com>2020-09-04 17:23:21 +0300
committerPaul Buetow <pbuetow@mimecast.com>2020-09-04 17:23:21 +0300
commitedee62717fbe752556d702c029a5b39de1b04677 (patch)
treee3c6d99d7a08e0005fd6340c664fb11912b89679 /internal/clients/baseclient.go
parentc562a013ef7e40e3a7f6126a6d327552f2bc557f (diff)
fix regex bug
Diffstat (limited to 'internal/clients/baseclient.go')
-rw-r--r--internal/clients/baseclient.go23
1 files changed, 13 insertions, 10 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))
}