summaryrefslogtreecommitdiff
path: root/internal/config
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2021-11-03 09:22:49 +0200
committerPaul Buetow <paul@buetow.org>2021-11-03 09:22:49 +0200
commit426196c23fa4be59ad024f5d6891b1de047581f9 (patch)
tree9024ac46e2fcd9ad1dd6c9ba14286e1b1c514726 /internal/config
parent69b4659b2e644506476a7285970121b3fc98c15b (diff)
Add integration test for long line splitting - Also fixed a bug regarding this along the way
Diffstat (limited to 'internal/config')
-rw-r--r--internal/config/initializer.go1
-rw-r--r--internal/config/server.go13
2 files changed, 9 insertions, 5 deletions
diff --git a/internal/config/initializer.go b/internal/config/initializer.go
index f8af8bc..1a7822c 100644
--- a/internal/config/initializer.go
+++ b/internal/config/initializer.go
@@ -83,6 +83,7 @@ func (in *initializer) transformConfig(sourceProcess source.Source, args *Args,
func (in *initializer) processEnvVars() {
if Env("DTAIL_INTEGRATION_TEST_RUN_MODE") {
os.Setenv("DTAIL_HOSTNAME_OVERRIDE", "integrationtest")
+ in.Server.MaxLineLength = 1024
}
}
diff --git a/internal/config/server.go b/internal/config/server.go
index 254ea0c..8285bdf 100644
--- a/internal/config/server.go
+++ b/internal/config/server.go
@@ -47,6 +47,8 @@ type ServerConfig struct {
MaxConcurrentCats int
// The max amount of concurrent tails per server.
MaxConcurrentTails int
+ // The max line length until it's split up into multiple smaller lines.
+ MaxLineLength int
// The user permissions. TODO: Add to JSON schema
Permissions Permissions `json:",omitempty"`
// The mapr log format
@@ -69,13 +71,14 @@ func newDefaultServerConfig() *ServerConfig {
defaultPermissions := []string{"^/.*"}
defaultBindAddress := "0.0.0.0"
return &ServerConfig{
- SSHBindAddress: defaultBindAddress,
- MaxConnections: 10,
- MaxConcurrentCats: 2,
- MaxConcurrentTails: 50,
- HostKeyFile: "./cache/ssh_host_key",
HostKeyBits: 4096,
+ HostKeyFile: "./cache/ssh_host_key",
MapreduceLogFormat: "default",
+ MaxConcurrentCats: 2,
+ MaxConcurrentTails: 50,
+ MaxConnections: 10,
+ MaxLineLength: 1024 * 1024,
+ SSHBindAddress: defaultBindAddress,
Permissions: Permissions{
Default: defaultPermissions,
},