summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2021-10-31 17:29:29 +0200
committerPaul Buetow <paul@buetow.org>2021-10-31 17:29:29 +0200
commitc1b3515ce4438c03ac9f6a74a6ede408e48f1515 (patch)
treef9e84fc2db0a7e20e325ff37339a8b7ba680084b
parentfeff2c21715ab75fdc27ab2a5dcc4d795c45bc17 (diff)
rename spartan mode to plain mode
-rw-r--r--cmd/dcat/main.go2
-rw-r--r--cmd/dgrep/main.go2
-rw-r--r--cmd/dmap/main.go2
-rw-r--r--cmd/dtail/main.go4
-rw-r--r--integrationtests/dcat_test.go4
-rw-r--r--integrationtests/dcatcolors.expected78
-rw-r--r--integrationtests/dcatcolors.txt78
-rw-r--r--integrationtests/dgrep_test.go8
-rw-r--r--internal/config/args.go8
-rw-r--r--internal/config/initializer.go4
-rw-r--r--internal/server/handlers/basehandler.go10
11 files changed, 100 insertions, 100 deletions
diff --git a/cmd/dcat/main.go b/cmd/dcat/main.go
index 8ac5eda..3f8bd5a 100644
--- a/cmd/dcat/main.go
+++ b/cmd/dcat/main.go
@@ -29,7 +29,7 @@ func main() {
flag.BoolVar(&args.NoColor, "noColor", false, "Disable ANSII terminal colors")
flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
- flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
+ flag.BoolVar(&args.Plain, "plain", false, "Plain output mode")
flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Trust all unknown host keys")
flag.BoolVar(&displayVersion, "version", false, "Display version")
flag.IntVar(&args.ConnectionsPerCPU, "cpc", config.DefaultConnectionsPerCPU,
diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go
index 8657fa9..6924cf3 100644
--- a/cmd/dgrep/main.go
+++ b/cmd/dgrep/main.go
@@ -30,7 +30,7 @@ func main() {
flag.BoolVar(&args.NoColor, "noColor", false, "Disable ANSII terminal colors")
flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
flag.BoolVar(&args.RegexInvert, "invert", false, "Invert regex")
- flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
+ flag.BoolVar(&args.Plain, "plain", false, "Plain output mode")
flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Trust all unknown host keys")
flag.BoolVar(&displayVersion, "version", false, "Display version")
flag.IntVar(&args.ConnectionsPerCPU, "cpc", config.DefaultConnectionsPerCPU,
diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go
index 79a53ba..a40da88 100644
--- a/cmd/dmap/main.go
+++ b/cmd/dmap/main.go
@@ -32,7 +32,7 @@ func main() {
flag.BoolVar(&args.NoColor, "noColor", false, "Disable ANSII terminal colors")
flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
- flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
+ flag.BoolVar(&args.Plain, "plain", false, "Plain output mode")
flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Trust all unknown host keys")
flag.BoolVar(&displayVersion, "version", false, "Display version")
flag.IntVar(&args.ConnectionsPerCPU, "cpc", config.DefaultConnectionsPerCPU,
diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go
index 2b46141..af22779 100644
--- a/cmd/dtail/main.go
+++ b/cmd/dtail/main.go
@@ -38,7 +38,7 @@ func main() {
flag.BoolVar(&args.NoColor, "noColor", false, "Disable ANSII terminal colors")
flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
flag.BoolVar(&args.RegexInvert, "invert", false, "Invert regex")
- flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
+ flag.BoolVar(&args.Plain, "plain", false, "Plain output mode")
flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Trust all unknown host keys")
flag.BoolVar(&checkHealth, "checkHealth", false, "Deprecated, flag will be removed soon")
flag.BoolVar(&displayColorTable, "colorTable", false, "Show color table")
@@ -74,7 +74,7 @@ func main() {
if displayVersion {
version.PrintAndExit()
}
- if !args.Spartan {
+ if !args.Plain {
if displayWideColorTable {
color.TablePrintAndExit(true)
}
diff --git a/integrationtests/dcat_test.go b/integrationtests/dcat_test.go
index 6928afa..124cb62 100644
--- a/integrationtests/dcat_test.go
+++ b/integrationtests/dcat_test.go
@@ -17,7 +17,7 @@ func TestDCat(t *testing.T) {
stdoutFile := "dcat.out"
_, err := runCommand(context.TODO(), t, stdoutFile,
- "../dcat", "--spartan", "--cfg", "none", testdataFile)
+ "../dcat", "--plain", "--cfg", "none", testdataFile)
if err != nil {
t.Error(err)
@@ -40,7 +40,7 @@ func TestDCat2(t *testing.T) {
expectedFile := "dcat2.txt.expected"
stdoutFile := "dcat2.out"
- args := []string{"--spartan", "--logLevel", "error", "--cfg", "none"}
+ args := []string{"--plain", "--logLevel", "error", "--cfg", "none"}
// Cat file 100 times in one session.
for i := 0; i < 100; i++ {
diff --git a/integrationtests/dcatcolors.expected b/integrationtests/dcatcolors.expected
index fcd8dbf..4f27e64 100644
--- a/integrationtests/dcatcolors.expected
+++ b/integrationtests/dcatcolors.expected
@@ -246,10 +246,10 @@
REMOTE|integrationtest|100|246|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:33724|Invoking request handler
REMOTE|integrationtest|100|247|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|Creating new server handler
REMOTE|integrationtest|100|248|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|protocol 4 base64 Y2F0OnNwYXJ0YW49dHJ1ZTpxdWlldD10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
-REMOTE|integrationtest|100|249|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:33724|Base64 decoded received command|cat:spartan=true:quiet=true /var/log/dserver/* regex:noop |58|[cat:spartan=true:quiet=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|249|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:33724|Base64 decoded received command|cat:plain=true:quiet=true /var/log/dserver/* regex:noop |58|[cat:plain=true:quiet=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
REMOTE|integrationtest|100|250|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|Enabling quiet mode
-REMOTE|integrationtest|100|251|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|Enabling spartan mode
-REMOTE|integrationtest|100|252|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|Handling user command|58|[cat:spartan=true:quiet=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|251|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|Enabling plain mode
+REMOTE|integrationtest|100|252|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|Handling user command|58|[cat:plain=true:quiet=true /var/log/dserver/* regex:noop ]
REMOTE|integrationtest|100|253|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:33724|/var/log/dserver/dserver.log|readfiles|Checking config permissions
REMOTE|integrationtest|100|254|dcatcolors.txt|FATAL|20211015-055201|paul@172.17.0.1:33724|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
REMOTE|integrationtest|100|255|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:33724|Start reading file|/var/log/dserver/dserver.log|dserver.log
@@ -518,10 +518,10 @@
REMOTE|integrationtest|100|518|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:34278|Invoking request handler
REMOTE|integrationtest|100|519|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|Creating new server handler
REMOTE|integrationtest|100|520|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
-REMOTE|integrationtest|100|521|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:34278|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|521|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:34278|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
REMOTE|integrationtest|100|522|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|Enabling quiet mode
-REMOTE|integrationtest|100|523|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|Enabling spartan mode
-REMOTE|integrationtest|100|524|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|523|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|Enabling plain mode
+REMOTE|integrationtest|100|524|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
REMOTE|integrationtest|100|525|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:34278|/var/log/dserver/dserver.log|readfiles|Checking config permissions
REMOTE|integrationtest|100|526|dcatcolors.txt|FATAL|20211015-055201|paul@172.17.0.1:34278|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
REMOTE|integrationtest|100|527|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:34278|Start reading file|/var/log/dserver/dserver.log|dserver.log
@@ -800,10 +800,10 @@
REMOTE|integrationtest|100|800|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:36830|Invoking request handler
REMOTE|integrationtest|100|801|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|Creating new server handler
REMOTE|integrationtest|100|802|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|protocol 4 base64 Y2F0OnF1aWV0PXRydWU6c3BhcnRhbj10cnVlIC92YXIvbG9nL2RzZXJ2ZXIvKiByZWdleDpub29wIA==
-REMOTE|integrationtest|100|803|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:36830|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|803|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:36830|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
REMOTE|integrationtest|100|804|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|Enabling quiet mode
-REMOTE|integrationtest|100|805|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|Enabling spartan mode
-REMOTE|integrationtest|100|806|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|805|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|Enabling plain mode
+REMOTE|integrationtest|100|806|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
REMOTE|integrationtest|100|807|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:36830|/var/log/dserver/dserver.log|readfiles|Checking config permissions
REMOTE|integrationtest|100|808|dcatcolors.txt|FATAL|20211015-055201|paul@172.17.0.1:36830|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
REMOTE|integrationtest|100|809|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:36830|Start reading file|/var/log/dserver/dserver.log|dserver.log
@@ -2101,7 +2101,7 @@
REMOTE|integrationtest|100|2101|dcatcolors.txt|INFO|20211015-055021|1|stats.go:53|8|11|7|0.45|781h38m58s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
REMOTE|integrationtest|100|2102|dcatcolors.txt|INFO|20211015-055059|paul@172.17.0.1:55200|Incoming authorization
REMOTE|integrationtest|100|2103|dcatcolors.txt|DEBUG|20211015-055059|paul@172.17.0.1:53194|protocol 4 base64 dGFpbDogL3Zhci9sb2cvZHNlcnZlci8qIHJlZ2V4Om5vb3Ag
-REMOTE|integrationtest|100|2104|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:56120|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|2104|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:56120|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
REMOTE|integrationtest|100|2105|dcatcolors.txt|INFO|20211015-054958|1|stats.go:53|8|11|7|0.45|781h38m36s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
REMOTE|integrationtest|100|2106|dcatcolors.txt|INFO|20211015-055047|1|stats.go:53|8|11|7|0.51|781h39m25s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
REMOTE|integrationtest|100|2107|dcatcolors.txt|DEBUG|20211015-055059|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:true,canSkipLines:true,seekEOF:true)
@@ -2115,14 +2115,14 @@
REMOTE|integrationtest|100|2115|dcatcolors.txt|INFO|20211015-055041|1|stats.go:53|8|11|7|0.61|781h39m18s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
REMOTE|integrationtest|100|2116|dcatcolors.txt|INFO|20211015-055059|1|stats.go:53|8|15|7|0.58|781h39m37s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=5
REMOTE|integrationtest|100|2117|dcatcolors.txt|DEBUG|20211015-055059|paul@172.17.0.1:53194|Handling user command|36|[tail: /var/log/dserver/* regex:noop ]
-REMOTE|integrationtest|100|2118|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:56120|Enabling spartan mode
+REMOTE|integrationtest|100|2118|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:56120|Enabling plain mode
REMOTE|integrationtest|100|2119|dcatcolors.txt|INFO|20211015-055018|1|stats.go:53|8|11|7|0.45|781h38m56s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
REMOTE|integrationtest|100|2120|dcatcolors.txt|INFO|20211015-055059|Handling connection
REMOTE|integrationtest|100|2121|dcatcolors.txt|DEBUG|20211015-055105|/var/log/dserver/dserver.log|File truncation check
REMOTE|integrationtest|100|2122|dcatcolors.txt|INFO|20211015-055051|1|stats.go:53|8|11|7|0.51|781h39m28s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
REMOTE|integrationtest|100|2123|dcatcolors.txt|INFO|20211015-055059|paul@172.17.0.1:55200|Invoking channel handler
REMOTE|integrationtest|100|2124|dcatcolors.txt|DEBUG|20211015-055059|paul@172.17.0.1:53194|/var/log/dserver/dserver.log|readfiles|Checking config permissions
-REMOTE|integrationtest|100|2125|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:56120|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|2125|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:56120|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
REMOTE|integrationtest|100|2126|dcatcolors.txt|INFO|20211015-055028|1|stats.go:53|8|11|7|0.53|781h39m6s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=4
REMOTE|integrationtest|100|2127|dcatcolors.txt|INFO|20211015-055059|paul@172.17.0.1:55050|Incoming authorization
REMOTE|integrationtest|100|2128|dcatcolors.txt|INFO|20211015-055107|1|stats.go:53|8|26|7|0.57|781h39m44s|MAPREDUCE:STATS|currentConnections=1|lifetimeConnections=5
@@ -2276,7 +2276,7 @@
REMOTE|integrationtest|100|2276|dcatcolors.txt|TRACE|20211015-055108|paul@172.17.0.1:46956|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
REMOTE|integrationtest|100|2277|dcatcolors.txt|INFO|20211015-055147|1|stats.go:53|8|11|7|0.41|781h40m25s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
REMOTE|integrationtest|100|2278|dcatcolors.txt|INFO|20211015-055148|paul@172.17.0.1:53198|Invoking request handler
-REMOTE|integrationtest|100|2279|dcatcolors.txt|TRACE|20211015-055223|paul@172.17.0.1:56122|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|2279|dcatcolors.txt|TRACE|20211015-055223|paul@172.17.0.1:56122|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
REMOTE|integrationtest|100|2280|dcatcolors.txt|INFO|20211015-055108|1|stats.go:53|8|16|7|0.57|781h39m46s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
REMOTE|integrationtest|100|2281|dcatcolors.txt|INFO|20211015-055117|1|stats.go:53|8|11|7|0.56|781h39m55s|MAPREDUCE:STATS|lifetimeConnections=5|currentConnections=0
REMOTE|integrationtest|100|2282|dcatcolors.txt|FATAL|20211015-055149|paul@172.17.0.1:58312|/var/log/dserver/dserver.log|readfiles|Server releaxed auth enabled
@@ -2290,14 +2290,14 @@
REMOTE|integrationtest|100|2290|dcatcolors.txt|INFO|20211015-055111|1|stats.go:53|8|11|7|0.57|781h39m48s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
REMOTE|integrationtest|100|2291|dcatcolors.txt|INFO|20211015-055148|paul@172.17.0.1:55202|Incoming authorization
REMOTE|integrationtest|100|2292|dcatcolors.txt|DEBUG|20211015-055148|paul@172.17.0.1:53198|protocol 4 base64 Y2F0OiAvdmFyL2xvZy9kc2VydmVyLyogcmVnZXg6bm9vcCA=
-REMOTE|integrationtest|100|2293|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:56122|Enabling spartan mode
+REMOTE|integrationtest|100|2293|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:56122|Enabling plain mode
REMOTE|integrationtest|100|2294|dcatcolors.txt|DEBUG|20211015-055108|paul@172.17.0.1:33004|shutdown()
REMOTE|integrationtest|100|2295|dcatcolors.txt|INFO|20211015-055137|1|stats.go:53|8|11|7|0.40|781h40m15s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
REMOTE|integrationtest|100|2296|dcatcolors.txt|DEBUG|20211015-055149|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
REMOTE|integrationtest|100|2297|dcatcolors.txt|INFO|20211015-055121|1|stats.go:53|8|11|7|0.56|781h39m58s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
REMOTE|integrationtest|100|2298|dcatcolors.txt|FATAL|20211015-055148|paul@172.17.0.1:55202|Granting permissions via relaxed-auth
REMOTE|integrationtest|100|2299|dcatcolors.txt|TRACE|20211015-055148|paul@172.17.0.1:53198|Base64 decoded received command|cat: /var/log/dserver/* regex:noop |35|[cat: /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
-REMOTE|integrationtest|100|2300|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:56122|Handling user command|58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]
+REMOTE|integrationtest|100|2300|dcatcolors.txt|DEBUG|20211015-055223|paul@172.17.0.1:56122|Handling user command|58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]
REMOTE|integrationtest|100|2301|dcatcolors.txt|TRACE|20211015-055108|paul@172.17.0.1:33004|flush()|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:278
REMOTE|integrationtest|100|2302|dcatcolors.txt|INFO|20211015-055147|1|stats.go:53|8|11|7|0.41|781h40m25s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=5
REMOTE|integrationtest|100|2303|dcatcolors.txt|INFO|20211015-055149|/var/log/dserver/dserver.log|End of file reached
@@ -2523,7 +2523,7 @@
REMOTE|integrationtest|100|2523|dcatcolors.txt|INFO|20211015-055201|Handling connection
REMOTE|integrationtest|100|2524|dcatcolors.txt|DEBUG|20211015-055154|paul@172.17.0.1:33008|/var/log/dserver/dserver.log|readfiles|Checking config permissions
REMOTE|integrationtest|100|2525|dcatcolors.txt|DEBUG|20211015-055154|paul@172.17.0.1:55054|shutdown()
-REMOTE|integrationtest|100|2526|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:58316|Base64 decoded received command|cat:quiet=true:spartan=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:spartan=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
+REMOTE|integrationtest|100|2526|dcatcolors.txt|TRACE|20211015-055201|paul@172.17.0.1:58316|Base64 decoded received command|cat:quiet=true:plain=true /var/log/dserver/* regex:noop |58|[cat:quiet=true:plain=true /var/log/dserver/* regex:noop ]|at /home/paul/git/dtail/internal/server/handlers/basehandler.go:225
REMOTE|integrationtest|100|2527|dcatcolors.txt|DEBUG|20211015-055154|readFile|readFile(filePath:/var/log/dserver/dserver.log,globID:dserver.log,retry:false,canSkipLines:false,seekEOF:false)
REMOTE|integrationtest|100|2528|dcatcolors.txt|INFO|20211015-055154|1|stats.go:53|8|13|7|0.54|781h40m32s|MAPREDUCE:STATS|currentConnections=0|lifetimeConnections=7
REMOTE|integrationtest|100|2529|dcatcolors.txt|INFO|20211015-055201|paul@172.17.0.1:53208|Incoming authorization
@@ -2535,13 +2535,13 @@
REMOTE|integrationtest|100|2535|dcatcolors.txt|FATAL|20211015-055201|paul@172.17.0.1:53208|Granting permissions via relaxed-auth
REMOTE|integrationtest|100|2536|dcatcolors.txt|INFO|20211015-055154|paul@172.17.0.1:33008|Start reading file|/var/log/dserver/dserver.log|dserver.log
REMOTE|integrationtest|100|2537|dcatcolors.txt|DEBUG|20211015-055154|paul@172.17.0.1:55054|Still lines to be sent
-REMOTE|integrationtest|100|2538|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:58316|Enabling spartan mode
+REMOTE|integrationtest|100|2538|dcatcolors.txt|DEBUG|20211015-055201|paul@172.17.0.1:58316|Enabling plain mode