lint warnings

5 files changed, 26 insertions, 22 deletions

diff --git a/internal/clients/baseclient.go b/internal/clients/baseclient.go
index 3025f72..013f2f2 100644
--- a/internal/clients/baseclient.go
+++ b/internal/clients/baseclient.go
@@ -20,8 +20,6 @@ type baseClient struct {
 	config.Args
 	// To display client side stats
 	stats *stats
-	// List of remote servers to connect to.
-	servers []string
 	// We have one connection per remote server.
 	connections []connectors.Connector
 	// SSH auth methods to use to connect to the remote servers.
diff --git a/internal/clients/connectors/serverconnection.go b/internal/clients/connectors/serverconnection.go
index aeb2a41..5c3d455 100644
--- a/internal/clients/connectors/serverconnection.go
+++ b/internal/clients/connectors/serverconnection.go
@@ -172,25 +172,31 @@ func (c *ServerConnection) handle(ctx context.Context, cancel context.CancelFunc
 	}
 
 	go func() {
-		io.Copy(stdinPipe, c.handler)
-		cancel()
+		defer cancel()
+		if _, err := io.Copy(stdinPipe, c.handler); err != nil {
+			dlog.Client.Trace(err)
+		}
 	}()
 	go func() {
-		io.Copy(c.handler, stdoutPipe)
-		cancel()
+		defer cancel()
+		if _, err := io.Copy(c.handler, stdoutPipe); err != nil {
+			dlog.Client.Trace(err)
+		}
 	}()
 	go func() {
+		defer cancel()
 		select {
 		case <-c.handler.Done():
 		case <-ctx.Done():
 		}
-		cancel()
 	}()
 
 	// Send all commands to client.
 	for _, command := range c.commands {
 		dlog.Client.Debug(command)
-		c.handler.SendMessage(command)
+		if err := c.handler.SendMessage(command); err != nil {
+			dlog.Client.Debug(err)
+		}
 	}
 
 	if !c.throttlingDone {
diff --git a/internal/clients/connectors/serverless.go b/internal/clients/connectors/serverless.go
index 431247a..631186a 100644
--- a/internal/clients/connectors/serverless.go
+++ b/internal/clients/connectors/serverless.go
@@ -83,29 +83,35 @@ func (s *Serverless) handle(ctx context.Context, cancel context.CancelFunc) erro
 	}
 
 	go func() {
-		io.Copy(serverHandler, s.handler)
+		defer terminate()
+		if _, err := io.Copy(serverHandler, s.handler); err != nil {
+			dlog.Client.Trace(err)
+		}
 		dlog.Client.Trace("io.Copy(serverHandler, s.handler) => done")
-		terminate()
 	}()
 	go func() {
-		io.Copy(s.handler, serverHandler)
+		defer terminate()
+		if _, err := io.Copy(s.handler, serverHandler); err != nil {
+			dlog.Client.Trace(err)
+		}
 		dlog.Client.Trace("io.Copy(s.handler, serverHandler) => done")
-		terminate()
 	}()
 	go func() {
+		defer terminate()
 		select {
 		case <-s.handler.Done():
 			dlog.Client.Trace("<-s.handler.Done()")
 		case <-ctx.Done():
 			dlog.Client.Trace("<-ctx.Done()")
 		}
-		terminate()
 	}()
 
 	// Send all commands to client.
 	for _, command := range s.commands {
 		dlog.Client.Debug("Sending command to serverless server", command)
-		s.handler.SendMessage(command)
+		if err := s.handler.SendMessage(command); err != nil {
+			dlog.Client.Debug(err)
+		}
 	}
 
 	<-ctx.Done()
diff --git a/internal/clients/maprclient.go b/internal/clients/maprclient.go
index 6362028..2bc66a4 100644
--- a/internal/clients/maprclient.go
+++ b/internal/clients/maprclient.go
@@ -82,7 +82,7 @@ func NewMaprClient(args config.Args, maprClientMode MaprClientMode) (*MaprClient
 	case "", ".":
 		c.RegexStr = "."
 	case "*":
-		c.RegexStr = fmt.Sprintf("\\|MAPREDUCE:\\|")
+		c.RegexStr = "\\|MAPREDUCE:\\|"
 	default:
 		c.RegexStr = fmt.Sprintf("\\|MAPREDUCE:%s\\|", c.query.Table)
 	}
diff --git a/internal/clients/stats.go b/internal/clients/stats.go
index 2da3cf7..7a6643b 100644
--- a/internal/clients/stats.go
+++ b/internal/clients/stats.go
@@ -89,7 +89,7 @@ func (s *stats) printStatsDueInterrupt(messages []string) {
 			))
 			continue
 		}
-		fmt.Println(fmt.Sprintf(" %s", message))
+		fmt.Printf(" %s\n", message)
 	}
 	time.Sleep(time.Second * time.Duration(config.InterruptTimeoutS))
 	dlog.Client.Resume()
@@ -128,12 +128,6 @@ func (s *stats) statsLine(connected, newConnections int, throttle int) string {
 	return sb.String()
 }
 
-func (s *stats) numConnected() int {
-	s.mutex.Lock()
-	defer s.mutex.Unlock()
-	return s.connected
-}
-
 func percentOf(total float64, value float64) float64 {
 	if total == 0 || total == value {
 		return 100