summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <pbuetow@mimecast.com>2020-02-29 08:22:34 +0000
committerPaul Buetow <pbuetow@mimecast.com>2020-02-29 08:22:34 +0000
commitc0b3f3b78aff46e56aff9b9c091b6f04572107f1 (patch)
tree5be5a26038aa7a4f886903fe3fef1bbcc7b16f3c
parent7911b102171309dfc43bc2faccac6de9e490f175 (diff)
better error messages
-rw-r--r--internal/server/handlers/controlhandler.go2
-rw-r--r--internal/server/handlers/serverhandler.go8
-rw-r--r--internal/version/version.go2
3 files changed, 6 insertions, 6 deletions
diff --git a/internal/server/handlers/controlhandler.go b/internal/server/handlers/controlhandler.go
index a33a78b..daa9835 100644
--- a/internal/server/handlers/controlhandler.go
+++ b/internal/server/handlers/controlhandler.go
@@ -87,6 +87,6 @@ func (h *ControlHandler) handleCommand(ctx context.Context, command string) {
case "debug":
h.serverMessages <- logger.Debug(h.user, "Receiving debug command", command, s)
default:
- h.serverMessages <- logger.Warn(h.user, "Received unknown command", command, s)
+ h.serverMessages <- logger.Warn(h.user, "Received unknown control command", command, s)
}
}
diff --git a/internal/server/handlers/serverhandler.go b/internal/server/handlers/serverhandler.go
index 819cddd..ba3a78e 100644
--- a/internal/server/handlers/serverhandler.go
+++ b/internal/server/handlers/serverhandler.go
@@ -233,7 +233,7 @@ func (h *ServerHandler) handleControlCommand(argc int, args []string) {
case "debug":
h.send(h.serverMessages, logger.Debug(h.user, "Receiving debug command", argc, args))
default:
- logger.Warn(h.user, "Received unknown command", argc, args)
+ logger.Warn(h.user, "Received unknown control command", argc, args)
}
}
@@ -248,7 +248,7 @@ func (h *ServerHandler) handleUserCommand(ctx context.Context, argc int, args []
}
splitted := strings.Split(args[0], ":")
- command := splitted[0]
+ commandName := splitted[0]
// TODO: Refactor: Create an "options" clase, combine makeOptions and readOptions there.
options, err := readOptions(splitted[1:])
@@ -258,7 +258,7 @@ func (h *ServerHandler) handleUserCommand(ctx context.Context, argc int, args []
return
}
- switch command {
+ switch commandName {
case "grep", "cat":
command := newReadCommand(h, omode.CatClient)
h.incrementActiveCommands()
@@ -369,7 +369,7 @@ func (h *ServerHandler) handleUserCommand(ctx context.Context, argc int, args []
finished()
default:
- h.sendServerMessage(logger.Error(h.user, "Received unknown command", argc, args))
+ h.sendServerMessage(logger.Error(h.user, "Received unknown user command", commandName, argc, args, options))
finished()
}
}
diff --git a/internal/version/version.go b/internal/version/version.go
index 3925bff..6115453 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -13,7 +13,7 @@ const (
// Version of DTail.
Version string = "2.1.1"
// Additional information for DTail
- Additional string = "develop"
+ Additional string = "develop2"
// ProtocolCompat -ibility version.
ProtocolCompat string = "2"
)