minor fix, add missing newlines to server messages

4 files changed, 16 insertions, 12 deletions

diff --git a/internal/io/fs/readfile.go b/internal/io/fs/readfile.go
index 90c5966..669f99f 100644
--- a/internal/io/fs/readfile.go
+++ b/internal/io/fs/readfile.go
@@ -321,7 +321,7 @@ func (f *readFile) handleReadByte(ctx context.Context, b byte,
 		if message.Len() >= config.Server.MaxLineLength {
 			if !f.warnedAboutLongLine {
 				f.serverMessages <- dlog.Common.Warn(f.filePath,
-					"Long log line, splitting into multiple lines")
+					"Long log line, splitting into multiple lines") + "\n"
 				f.warnedAboutLongLine = true
 			}
 			message.WriteByte('\n')
diff --git a/internal/server/handlers/basehandler.go b/internal/server/handlers/basehandler.go
index 4fd718e..7daf071 100644
--- a/internal/server/handlers/basehandler.go
+++ b/internal/server/handlers/basehandler.go
@@ -150,7 +150,7 @@ func (h *baseHandler) handleCommand(commandStr string) {
 	}
 	args, argc, err = h.handleBase64(args, argc)
 	if err != nil {
-		h.send(h.serverMessages, dlog.Server.Error(h.user, err))
+		h.sendln(h.serverMessages, dlog.Server.Error(h.user, err))
 		return
 	}
 	ctx, cancel := context.WithCancel(context.Background())
@@ -170,7 +170,7 @@ func (h *baseHandler) handleCommand(commandStr string) {
 
 	options, ltx, err := config.DeserializeOptions(parts[1:])
 	if err != nil {
-		h.send(h.serverMessages, dlog.Server.Error(h.user, err))
+		h.sendln(h.serverMessages, dlog.Server.Error(h.user, err))
 		return
 	}
 	h.handleOptions(options)
@@ -231,7 +231,7 @@ func (h *baseHandler) handleBase64(args []string, argc int) ([]string, int, erro
 func (h *baseHandler) handleAckCommand(argc int, args []string) {
 	if argc < 3 {
 		if !h.quiet {
-			h.send(h.serverMessages, dlog.Server.Warn(h.user,
+			h.sendln(h.serverMessages, dlog.Server.Warn(h.user,
 				"Unable to parse command", args, argc))
 		}
 		return
@@ -274,6 +274,10 @@ func (h *baseHandler) send(ch chan<- string, message string) {
 	}
 }
 
+func (h *baseHandler) sendln(ch chan<- string, message string) {
+	h.send(ch, message+"\n")
+}
+
 func (h *baseHandler) flush() {
 	dlog.Server.Trace(h.user, "flush()")
 	numUnsentMessages := func() int {
diff --git a/internal/server/handlers/readcommand.go b/internal/server/handlers/readcommand.go
index 85f5b2d..44ba9e4 100644
--- a/internal/server/handlers/readcommand.go
+++ b/internal/server/handlers/readcommand.go
@@ -35,14 +35,14 @@ func (r *readCommand) Start(ctx context.Context, ltx lcontext.LContext,
 	if argc >= 4 {
 		deserializedRegex, err := regex.Deserialize(strings.Join(args[2:], " "))
 		if err != nil {
-			r.server.send(r.server.serverMessages, dlog.Server.Error(r.server.user,
+			r.server.sendln(r.server.serverMessages, dlog.Server.Error(r.server.user,
 				"Unable to parse command", err))
 			return
 		}
 		re = deserializedRegex
 	}
 	if argc < 3 {
-		r.server.send(r.server.serverMessages, dlog.Server.Warn(r.server.user,
+		r.server.sendln(r.server.serverMessages, dlog.Server.Warn(r.server.user,
 			"Unable to parse command", args, argc))
 		return
 	}
@@ -76,7 +76,7 @@ func (r *readCommand) readGlob(ctx context.Context, ltx lcontext.LContext,
 
 		if numPaths := len(paths); numPaths == 0 {
 			dlog.Server.Error(r.server.user, "No such file(s) to read", glob)
-			r.server.send(r.server.serverMessages, dlog.Server.Warn(r.server.user,
+			r.server.sendln(r.server.serverMessages, dlog.Server.Warn(r.server.user,
 				"Unable to read file(s), check server logs"))
 			select {
 			case <-ctx.Done():
@@ -91,7 +91,7 @@ func (r *readCommand) readGlob(ctx context.Context, ltx lcontext.LContext,
 		return
 	}
 
-	r.server.send(r.server.serverMessages, dlog.Server.Warn(r.server.user,
+	r.server.sendln(r.server.serverMessages, dlog.Server.Warn(r.server.user,
 		"Giving up to read file(s)"))
 	return
 }
@@ -114,7 +114,7 @@ func (r *readCommand) readFileIfPermissions(ctx context.Context, ltx lcontext.LC
 	globID := r.makeGlobID(path, glob)
 	if !r.server.user.HasFilePermission(path, "readfiles") {
 		dlog.Server.Error(r.server.user, "No permission to read file", path, globID)
-		r.server.send(r.server.serverMessages, dlog.Server.Warn(r.server.user,
+		r.server.sendln(r.server.serverMessages, dlog.Server.Warn(r.server.user,
 			"Unable to read file(s), check server logs"))
 		return
 	}
@@ -206,7 +206,7 @@ func (r *readCommand) makeGlobID(path, glob string) string {
 		return pathParts[len(pathParts)-1]
 	}
 
-	r.server.send(r.server.serverMessages,
+	r.server.sendln(r.server.serverMessages,
 		dlog.Server.Warn("Empty file path given?", path, glob))
 	return ""
 }
diff --git a/internal/server/handlers/serverhandler.go b/internal/server/handlers/serverhandler.go
index bc22c88..69bebc4 100644
--- a/internal/server/handlers/serverhandler.go
+++ b/internal/server/handlers/serverhandler.go
@@ -81,7 +81,7 @@ func (h *ServerHandler) handleUserCommand(ctx context.Context, ltx lcontext.LCon
 	case "map":
 		command, aggregate, err := newMapCommand(h, argc, args)
 		if err != nil {
-			h.send(h.serverMessages, err.Error())
+			h.sendln(h.serverMessages, err.Error())
 			dlog.Server.Error(h.user, err)
 			commandFinished()
 			return
@@ -95,7 +95,7 @@ func (h *ServerHandler) handleUserCommand(ctx context.Context, ltx lcontext.LCon
 		h.handleAckCommand(argc, args)
 		commandFinished()
 	default:
-		h.send(h.serverMessages, dlog.Server.Error(h.user,
+		h.sendln(h.serverMessages, dlog.Server.Error(h.user,
 			"Received unknown user command", commandName, argc, args))
 		commandFinished()
 	}