summaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
authorPaul Buetow <git@mx.buetow.org>2020-12-26 14:00:41 +0000
committerPaul Buetow <git@mx.buetow.org>2020-12-26 14:00:41 +0000
commitb05ae938aa6ada831d19de076861e246a03a9d7d (patch)
tree673b6c61470262e7c39342cd8c17f984ef0a4b0d /internal
parent60fa324cd5296b088c24d8db1d334a25ca955788 (diff)
rename spartan to quiet
Diffstat (limited to 'internal')
-rw-r--r--internal/clients/args.go2
-rw-r--r--internal/clients/baseclient.go2
-rw-r--r--internal/clients/catclient.go2
-rw-r--r--internal/clients/grepclient.go2
-rw-r--r--internal/clients/maprclient.go2
-rw-r--r--internal/clients/stats.go4
-rw-r--r--internal/clients/tailclient.go2
-rw-r--r--internal/server/handlers/serverhandler.go10
8 files changed, 13 insertions, 13 deletions
diff --git a/internal/clients/args.go b/internal/clients/args.go
index cd0f174..7f782f1 100644
--- a/internal/clients/args.go
+++ b/internal/clients/args.go
@@ -22,5 +22,5 @@ type Args struct {
SSHAuthMethods []gossh.AuthMethod
SSHHostKeyCallback gossh.HostKeyCallback
PrivateKeyPathFile string
- Spartan bool
+ Quiet bool
}
diff --git a/internal/clients/baseclient.go b/internal/clients/baseclient.go
index 1e40ff2..572680c 100644
--- a/internal/clients/baseclient.go
+++ b/internal/clients/baseclient.go
@@ -70,7 +70,7 @@ func (c *baseClient) Start(ctx context.Context, statsCh <-chan string) (status i
// Periodically check for unknown hosts, and ask the user whether to trust them or not.
go c.hostKeyCallback.PromptAddHosts(ctx)
// Print client stats every time something on statsCh is recieved.
- go c.stats.Start(ctx, c.throttleCh, statsCh, c.Args.Spartan)
+ go c.stats.Start(ctx, c.throttleCh, statsCh, c.Args.Quiet)
// Keep count of active connections
active := make(chan struct{}, len(c.connections))
diff --git a/internal/clients/catclient.go b/internal/clients/catclient.go
index 50a8d18..b7b6131 100644
--- a/internal/clients/catclient.go
+++ b/internal/clients/catclient.go
@@ -42,7 +42,7 @@ func (c CatClient) makeHandler(server string) handlers.Handler {
}
func (c CatClient) makeCommands() (commands []string) {
- options := fmt.Sprintf("spartan=%v", c.Args.Spartan)
+ options := fmt.Sprintf("quiet=%v", c.Args.Quiet)
for _, file := range strings.Split(c.What, ",") {
commands = append(commands, fmt.Sprintf("%s:%s %s %s", c.Mode.String(), options, file, c.Regex.Serialize()))
}
diff --git a/internal/clients/grepclient.go b/internal/clients/grepclient.go
index 5fa0ae0..652c31b 100644
--- a/internal/clients/grepclient.go
+++ b/internal/clients/grepclient.go
@@ -41,7 +41,7 @@ func (c GrepClient) makeHandler(server string) handlers.Handler {
}
func (c GrepClient) makeCommands() (commands []string) {
- options := fmt.Sprintf("spartan=%v", c.Args.Spartan)
+ options := fmt.Sprintf("quiet=%v", c.Args.Quiet)
for _, file := range strings.Split(c.What, ",") {
commands = append(commands, fmt.Sprintf("%s:%s %s %s", c.Mode.String(), options, file, c.Regex.Serialize()))
}
diff --git a/internal/clients/maprclient.go b/internal/clients/maprclient.go
index d201d40..9beea13 100644
--- a/internal/clients/maprclient.go
+++ b/internal/clients/maprclient.go
@@ -112,7 +112,7 @@ func (c MaprClient) makeHandler(server string) handlers.Handler {
func (c MaprClient) makeCommands() (commands []string) {
commands = append(commands, fmt.Sprintf("map %s", c.query.RawQuery))
- options := fmt.Sprintf("spartan=%v", c.Args.Spartan)
+ options := fmt.Sprintf("quiet=%v", c.Args.Quiet)
modeStr := "cat"
if c.Mode == omode.TailClient {
diff --git a/internal/clients/stats.go b/internal/clients/stats.go
index 3ea59b7..d8163d4 100644
--- a/internal/clients/stats.go
+++ b/internal/clients/stats.go
@@ -34,7 +34,7 @@ func newTailStats(connectionsTotal int) *stats {
// Start starts printing client connection stats every time a signal is recieved or
// connection count has changed.
-func (s *stats) Start(ctx context.Context, throttleCh <-chan struct{}, statsCh <-chan string, spartan bool) {
+func (s *stats) Start(ctx context.Context, throttleCh <-chan struct{}, statsCh <-chan string, quiet bool) {
var connectedLast int
for {
@@ -55,7 +55,7 @@ func (s *stats) Start(ctx context.Context, throttleCh <-chan struct{}, statsCh <
newConnections := connected - connectedLast
- if (connected == connectedLast || spartan) && !force {
+ if (connected == connectedLast || quiet) && !force {
continue
}
diff --git a/internal/clients/tailclient.go b/internal/clients/tailclient.go
index 853bdf1..cefbaa7 100644
--- a/internal/clients/tailclient.go
+++ b/internal/clients/tailclient.go
@@ -38,7 +38,7 @@ func (c TailClient) makeHandler(server string) handlers.Handler {
}
func (c TailClient) makeCommands() (commands []string) {
- options := fmt.Sprintf("spartan=%v", c.Args.Spartan)
+ options := fmt.Sprintf("quiet=%v", c.Args.Quiet)
for _, file := range strings.Split(c.What, ",") {
commands = append(commands, fmt.Sprintf("%s:%s %s %s", c.Mode.String(), options, file, c.Regex.Serialize()))
}
diff --git a/internal/server/handlers/serverhandler.go b/internal/server/handlers/serverhandler.go
index 5b948b3..3212ee1 100644
--- a/internal/server/handlers/serverhandler.go
+++ b/internal/server/handlers/serverhandler.go
@@ -43,7 +43,7 @@ type ServerHandler struct {
ackCloseReceived chan struct{}
activeCommands int32
activeReaders int32
- spartan bool
+ quiet bool
}
// NewServerHandler returns the server handler.
@@ -246,10 +246,10 @@ func (h *ServerHandler) handleUserCommand(ctx context.Context, argc int, args []
commandFinished()
return
}
- if spartan, ok := options["spartan"]; ok {
- if spartan == "true" {
- logger.Debug(h.user, "Enabling spartan mode")
- h.spartan = true
+ if quiet, ok := options["quiet"]; ok {
+ if quiet == "true" {
+ logger.Debug(h.user, "Enabling quiet mode")
+ h.quiet = true
}
}