From 71d2786aeaa793d9cf51c389d2e91cf472d25f7a Mon Sep 17 00:00:00 2001
From: Paul Buetow <pbuetow@mimecast.com>
Date: Fri, 28 Feb 2020 13:14:29 +0000
Subject: more on scheduled commands

---
 internal/server/handlers/mapcommand.go    | 10 ++++------
 internal/server/handlers/readcommand.go   |  4 ++--
 internal/server/handlers/serverhandler.go |  2 ++
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'internal/server/handlers')

diff --git a/internal/server/handlers/mapcommand.go b/internal/server/handlers/mapcommand.go
index 10372da..c3e600e 100644
--- a/internal/server/handlers/mapcommand.go
+++ b/internal/server/handlers/mapcommand.go
@@ -15,18 +15,16 @@ type mapCommand struct {
 
 // NewMapCommand returns a new server side mapreduce command.
 func newMapCommand(serverHandler *ServerHandler, argc int, args []string) (mapCommand, *server.Aggregate, error) {
-	mapCommand := mapCommand{
-		server: serverHandler,
-	}
+	m := mapCommand{server: serverHandler}
 
 	queryStr := strings.Join(args[1:], " ")
 	aggregate, err := server.NewAggregate(queryStr)
 	if err != nil {
-		return mapCommand, nil, err
+		return m, nil, err
 	}
 
-	mapCommand.aggregate = aggregate
-	return mapCommand, aggregate, nil
+	m.aggregate = aggregate
+	return m, aggregate, nil
 
 }
 
diff --git a/internal/server/handlers/readcommand.go b/internal/server/handlers/readcommand.go
index 6ab41cd..63158f6 100644
--- a/internal/server/handlers/readcommand.go
+++ b/internal/server/handlers/readcommand.go
@@ -27,8 +27,8 @@ func newReadCommand(server *ServerHandler, mode omode.Mode) *readCommand {
 func (r *readCommand) Start(ctx context.Context, argc int, args []string) {
 	regex := "."
 	if argc >= 4 {
-	    regex = strings.Join(args[3:], " ")
-	    logger.Debug("Joined regex", regex)
+		regex = strings.Join(args[3:], " ")
+		logger.Debug("Joined regex", regex)
 	}
 	if argc < 3 {
 		r.server.sendServerMessage(logger.Warn(r.server.user, commandParseWarning, args, argc))
diff --git a/internal/server/handlers/serverhandler.go b/internal/server/handlers/serverhandler.go
index b840c77..2979dd5 100644
--- a/internal/server/handlers/serverhandler.go
+++ b/internal/server/handlers/serverhandler.go
@@ -229,6 +229,7 @@ func (h *ServerHandler) handleUserCommand(ctx context.Context, argc int, args []
 		if err != nil {
 			h.sendServerMessage(err.Error())
 			logger.Error(h.user, err)
+			h.shutdown()
 			return
 		}
 
@@ -334,6 +335,7 @@ func (h *ServerHandler) incrementActiveReaders() {
 	defer h.mutex.Unlock()
 	h.activeReaders++
 }
+
 func (h *ServerHandler) decrementActiveReaders() int {
 	h.mutex.Lock()
 	defer h.mutex.Unlock()
-- 
cgit v1.2.3