summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <pbuetow@mimecast.com>2020-03-18 17:37:05 +0000
committerPaul Buetow <pbuetow@mimecast.com>2020-03-18 17:37:05 +0000
commit077af4d92fe318f8383b026e92f05390d764830a (patch)
tree8ff8153c7ce261ea50ef106bf130a2f310e63506
parent68aa3c09209d9280e36b072540be2e5acbee2f64 (diff)
make lint and vet happyv2.2.0
-rw-r--r--internal/io/logger/logger.go2
-rw-r--r--internal/io/logger/modes.go1
-rw-r--r--internal/io/logger/strategy.go2
-rw-r--r--internal/io/run/run.go1
-rw-r--r--internal/mapr/logformat/generic.go2
-rw-r--r--internal/server/background/background.go2
6 files changed, 6 insertions, 4 deletions
diff --git a/internal/io/logger/logger.go b/internal/io/logger/logger.go
index f04ad1d..bfe4b29 100644
--- a/internal/io/logger/logger.go
+++ b/internal/io/logger/logger.go
@@ -27,7 +27,7 @@ const (
traceStr string = "TRACE"
)
-// The configured logging mode(s)
+// Mode specifies the configured logging mode(s)
var Mode Modes
// Strategy is the current log strattegy used.
diff --git a/internal/io/logger/modes.go b/internal/io/logger/modes.go
index 0a985cd..0ec3f68 100644
--- a/internal/io/logger/modes.go
+++ b/internal/io/logger/modes.go
@@ -1,5 +1,6 @@
package logger
+// Modes specifies the logging mode.
type Modes struct {
Server bool
Trace bool
diff --git a/internal/io/logger/strategy.go b/internal/io/logger/strategy.go
index 5667812..44bf393 100644
--- a/internal/io/logger/strategy.go
+++ b/internal/io/logger/strategy.go
@@ -2,7 +2,7 @@ package logger
import "github.com/mimecast/dtail/internal/config"
-// strategy allows to specify a log rotation strategy.
+// Strategy allows to specify a log rotation strategy.
type Strategy int
// Possible log strategies.
diff --git a/internal/io/run/run.go b/internal/io/run/run.go
index 4d57f9f..2bb3756 100644
--- a/internal/io/run/run.go
+++ b/internal/io/run/run.go
@@ -112,6 +112,7 @@ func (r Run) pipeToLines(commandExited chan struct{}, wg *sync.WaitGroup, pid in
select {
case <-commandExited:
return
+ default:
}
continue
}
diff --git a/internal/mapr/logformat/generic.go b/internal/mapr/logformat/generic.go
index 9102c0b..9c12556 100644
--- a/internal/mapr/logformat/generic.go
+++ b/internal/mapr/logformat/generic.go
@@ -1,6 +1,6 @@
package logformat
-// MakeFieldsGENEROC is the generic log line parser.
+// MakeFieldsGENERIC is the generic log line parser.
func (p *Parser) MakeFieldsGENERIC(maprLine string) (map[string]string, error) {
fields := make(map[string]string, 3)
diff --git a/internal/server/background/background.go b/internal/server/background/background.go
index 225b82a..3907448 100644
--- a/internal/server/background/background.go
+++ b/internal/server/background/background.go
@@ -91,7 +91,7 @@ func (b Background) ListJobsC(userName string) <-chan string {
b.mutex.Lock()
defer b.mutex.Unlock()
- for k, _ := range b.jobs {
+ for k := range b.jobs {
logger.Debug("ListJobsC", k, userName)
if strings.HasPrefix(k, fmt.Sprintf("%s.", userName)) {
ch <- k