Merge branch 'develop' of gitlab.devuk.mimecast.lan:Storage/dtail

README.md

@@ -1,7 +1,9 @@
 DTail
 =====
 
-![DTail](doc/logo.png "DTail")
+![DTail](doc/title.png "DTail")
+
+[![License](https://img.shields.io/github/license/mimecast/dtail)](https://www.apache.org/licenses/LICENSE-2.0.html) [![Go Report Card](https://goreportcard.com/badge/github.com/mimecast/dtail)](https://goreportcard.com/report/github.com/mimecast/dtail) [![Hits-of-Code](https://hitsofcode.com/github/mimecast/dtail)](https://www.vbrandl.net/post/2019-05-03_hits-of-code/) ![GitHub issues](https://img.shields.io/github/issues/mimecast/dtail) ![GitHub forks](https://img.shields.io/github/forks/mimecast/dtail) ![GitHub stars](https://img.shields.io/github/stars/mimecast/dtail)
 
 DTail (a distributed tail program) is a DevOps tool for engineers programmed in Google Go for following (tailing), catting and grepping (including gzip and zstd decompression support) log files on many machines concurrently. An advanced feature of DTail is to execute distributed mapreduce aggregations across many machines.
 
@@ -31,5 +33,5 @@ Credits
 =======
 
 * DTail was created by **Paul Buetow** *<pbuetow@mimecast.com>*
-
-* Thank you to **Vlad-Marian Marian** for creating the DTail logo.
+* Thank you to **Vlad-Marian Marian** for creating the DTail (dog) logo.
+* The Gopher was generated at https://gopherize.me

docker/spindown.sh

@@ -3,6 +3,8 @@
 declare -i NUM_INSTANCES=$1
 declare -i BASE_PORT=2222
 
+rm serverlist.txt &>/dev/null
+
 for (( i=0; i < $NUM_INSTANCES; i++ )); do
     port=$[ BASE_PORT + i + 1 ]
 	docker stop dserver-serv$i 

internal/discovery/discovery.go

@@ -24,7 +24,7 @@ const (
 type Discovery struct {
 	// To plug in a custom server discovery module.
 	module string
-	// To specifiy optional server discovery module options.
+	// To specify optional server discovery module options.
 	options string
 	// To either filter a server list or to secify an exact list.
 	server string

internal/mapr/logformat/default_test.go

@@ -28,7 +28,7 @@ func TestDefaultLogFormat(t *testing.T) {
 		t.Errorf("Expected 'bay' stored in field 'baz', but got '%s'\n", bay)
 	}
 
-	fields, err = parser.MakeFields("foo=bar|bazbay")
+	_, err = parser.MakeFields("foo=bar|bazbay")
 	if err == nil {
 		t.Errorf("Expected error but didn't: %s", err.Error())
 	}

internal/server/handlers/serverhandler.go

@@ -89,7 +89,7 @@ func (h *ServerHandler) Read(p []byte) (n int, err error) {
 		select {
 		case message := <-h.serverMessages:
 			if len(message) == 0 {
-				logger.Warn(h.user, "Empty message recieved")
+				logger.Warn(h.user, "Empty message received")
 				return
 			}
 			if message[0] == '.' {

internal/server/server.go

@@ -204,7 +204,7 @@ func (s *Server) handleRequests(ctx context.Context, sshConn gossh.Conn, in <-ch
 		default:
 			req.Reply(false, nil)
 
-			return fmt.Errorf("Closing SSH connection as unknown request recieved|%s|%v",
+			return fmt.Errorf("Closing SSH connection as unknown request received|%s|%v",
 				req.Type, payload.Value)
 		}
 	}

internal/user/server/user.go

@@ -37,7 +37,7 @@ func (u *User) String() string {
 	return fmt.Sprintf("%s@%s", u.Name, u.remoteAddress)
 }
 
-// HasFilePermission is used to determine whether user is alowed to read a file.
+// HasFilePermission is used to determine whether user is allowed to read a file.
 func (u *User) HasFilePermission(filePath, permissionType string) (hasPermission bool) {
 	logger.Debug(u, filePath, permissionType, "Checking config permissions")
 	if config.ServerRelaxedAuthEnable {