diff options
| -rw-r--r-- | .gitignore | 13 | ||||
| -rw-r--r-- | internal/clients/maprclient.go | 4 | ||||
| -rw-r--r-- | internal/mapr/groupset.go | 2 | ||||
| -rw-r--r-- | internal/ssh/client/authmethods.go | 9 | ||||
| -rw-r--r-- | internal/version/version.go | 2 |
5 files changed, 19 insertions, 11 deletions
@@ -1,14 +1,9 @@ -*_proprietary.go -<<<<<<< HEAD -cache/ -log/ -tags -======= -/cache/ -/log/ +/cache +/log +/tags /dtail /dgrep /dcat /dmap /dserver ->>>>>>> 7ee0121afed3e7cab6457142f70e411020ab2b21 +/bin diff --git a/internal/clients/maprclient.go b/internal/clients/maprclient.go index 6a06aaf..feb7e47 100644 --- a/internal/clients/maprclient.go +++ b/internal/clients/maprclient.go @@ -131,6 +131,10 @@ func (c MaprClient) makeCommands(options map[string]string) (commands []string) } func (c *MaprClient) periodicReportResults(ctx context.Context) { + rampUpSleep := c.query.Interval / 2 + logger.Debug("Ramp up sleeping before processing mapreduce results", rampUpSleep) + time.Sleep(rampUpSleep) + for { select { case <-time.After(c.query.Interval): diff --git a/internal/mapr/groupset.go b/internal/mapr/groupset.go index 6ee2811..b5c8a48 100644 --- a/internal/mapr/groupset.go +++ b/internal/mapr/groupset.go @@ -68,7 +68,7 @@ func (g *GroupSet) WriteResult(query *Query) error { } // -1: Don't limit the result, include all data sets - result, _, err := g.limitedResult(query, -1, "", ",", true) + result, _, err := g.limitedResult(query, query.Limit, "", ",", true) if err != nil { return err } diff --git a/internal/ssh/client/authmethods.go b/internal/ssh/client/authmethods.go index 2ff80b2..bbfb7be 100644 --- a/internal/ssh/client/authmethods.go +++ b/internal/ssh/client/authmethods.go @@ -77,6 +77,15 @@ func initKnownHostsAuthMethods(trustAllHosts bool, throttleCh chan struct{}, pri } logger.Debug("initKnownHostsAuthMethods", "Unable to use private key", privateKeyPath, err) + privateKeyPath = os.Getenv("HOME") + "/.ssh/id_ecdsa" + authMethod, err = ssh.PrivateKey(privateKeyPath) + if err == nil { + sshAuthMethods = append(sshAuthMethods, authMethod) + logger.Debug("initKnownHostsAuthmethods", "Added path to list of auth methods, not adding further methods", privateKeyPath) + return sshAuthMethods, knownHostsCallback + } + logger.Debug("initKnownHostsAuthMethods", "Unable to use private key", privateKeyPath, err) + logger.FatalExit("Unable to find private SSH key information") // Never reach this point. diff --git a/internal/version/version.go b/internal/version/version.go index c0f349c..a6d6b05 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -11,7 +11,7 @@ const ( // Name of DTail. Name string = "DTail" // Version of DTail. - Version string = "3.2.0" + Version string = "3.2.2" // Additional information for DTail Additional string = "" // ProtocolCompat -ibility version. |