summaryrefslogtreecommitdiff
path: root/internal/server/handlers/serverhandler.go
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2021-10-10 14:02:12 +0300
committerPaul Buetow <paul@buetow.org>2021-10-10 14:15:26 +0300
commitf44792c9102488774c9993b080f35c65287a64b1 (patch)
tree94b0be371a2135f4fea63bca87e14ce057fc172e /internal/server/handlers/serverhandler.go
parent97747ea0f3178f7f5890512d483fdccaa82846b0 (diff)
add another dmap test - reading 100 source files at once
fix a data race when reading multiple files on one server from the same session at once
Diffstat (limited to 'internal/server/handlers/serverhandler.go')
-rw-r--r--internal/server/handlers/serverhandler.go18
1 files changed, 2 insertions, 16 deletions
diff --git a/internal/server/handlers/serverhandler.go b/internal/server/handlers/serverhandler.go
index f12d590..52c4570 100644
--- a/internal/server/handlers/serverhandler.go
+++ b/internal/server/handlers/serverhandler.go
@@ -4,7 +4,6 @@ import (
"context"
"os"
"strings"
- "sync/atomic"
"github.com/mimecast/dtail/internal"
"github.com/mimecast/dtail/internal/io/dlog"
@@ -55,7 +54,7 @@ func NewServerHandler(user *user.User, catLimiter,
}
func (h *ServerHandler) handleUserCommand(ctx context.Context, argc int,
- args []string, commandName string, options map[string]string) {
+ args []string, commandName string) {
dlog.Server.Debug(h.user, "Handling user command", argc, args)
h.incrementActiveCommands()
@@ -65,19 +64,6 @@ func (h *ServerHandler) handleUserCommand(ctx context.Context, argc int,
}
}
- if quiet, _ := options["quiet"]; quiet == "true" {
- dlog.Server.Debug(h.user, "Enabling quiet mode")
- h.quiet = true
- }
- if spartan, _ := options["spartan"]; spartan == "true" {
- dlog.Server.Debug(h.user, "Enabling spartan mode")
- h.spartan = true
- }
- if serverless, _ := options["serverless"]; serverless == "true" {
- dlog.Server.Debug(h.user, "Enabling serverless mode")
- atomic.AddInt32(&h.serverless, 1)
- }
-
switch commandName {
case "grep", "cat":
command := newReadCommand(h, omode.CatClient)
@@ -109,7 +95,7 @@ func (h *ServerHandler) handleUserCommand(ctx context.Context, argc int,
commandFinished()
default:
h.send(h.serverMessages, dlog.Server.Error(h.user,
- "Received unknown user command", commandName, argc, args, options))
+ "Received unknown user command", commandName, argc, args))
commandFinished()
}
}