diff --git a/config.template.yml b/config.template.yml index 9fb6c8e72..ef0a3bd35 100644 --- a/config.template.yml +++ b/config.template.yml @@ -96,10 +96,10 @@ server: # timeouts: ## Read timeout. - # read: 2s + # read: 6s ## Write timeout. - # write: 2s + # write: 6s ## Idle timeout. # idle: 30s @@ -148,10 +148,10 @@ telemetry: # timeouts: ## Read timeout. - # read: 2s + # read: 6s ## Write timeout. - # write: 2s + # write: 6s ## Idle timeout. # idle: 30s diff --git a/docs/content/en/configuration/miscellaneous/server.md b/docs/content/en/configuration/miscellaneous/server.md index 2143bd390..4d6202c26 100644 --- a/docs/content/en/configuration/miscellaneous/server.md +++ b/docs/content/en/configuration/miscellaneous/server.md @@ -35,8 +35,8 @@ server: read: 4096 write: 4096 timeouts: - read: 10s - write: 10s + read: 6s + write: 6s idle: 10s ``` diff --git a/docs/content/en/configuration/prologue/common.md b/docs/content/en/configuration/prologue/common.md index fc3469331..4c37a16c5 100644 --- a/docs/content/en/configuration/prologue/common.md +++ b/docs/content/en/configuration/prologue/common.md @@ -152,7 +152,7 @@ Configures the maximum response size. The default of 4096 is generally sufficien ### read -{{< confkey type="duration" default="2s" required="no" >}} +{{< confkey type="duration" default="6s" required="no" >}} *__Note:__ This setting uses the [duration notation format](#duration-notation-format). Please see the [common options](#duration-notation-format) documentation for information on this format.* @@ -161,7 +161,7 @@ Configures the server read timeout. ### write -{{< confkey type="duration" default="2s" required="no" >}} +{{< confkey type="duration" default="6s" required="no" >}} *__Note:__ This setting uses the [duration notation format](#duration-notation-format). Please see the [common options](#duration-notation-format) documentation for information on this format.* diff --git a/docs/content/en/configuration/telemetry/metrics.md b/docs/content/en/configuration/telemetry/metrics.md index 42c209082..4917637e1 100644 --- a/docs/content/en/configuration/telemetry/metrics.md +++ b/docs/content/en/configuration/telemetry/metrics.md @@ -25,8 +25,8 @@ telemetry: read: 4096 write: 4096 timeouts: - read: 2s - write: 2s + read: 6s + write: 6s idle: 30s ``` diff --git a/internal/configuration/config.template.yml b/internal/configuration/config.template.yml index 9fb6c8e72..ef0a3bd35 100644 --- a/internal/configuration/config.template.yml +++ b/internal/configuration/config.template.yml @@ -96,10 +96,10 @@ server: # timeouts: ## Read timeout. - # read: 2s + # read: 6s ## Write timeout. - # write: 2s + # write: 6s ## Idle timeout. # idle: 30s @@ -148,10 +148,10 @@ telemetry: # timeouts: ## Read timeout. - # read: 2s + # read: 6s ## Write timeout. - # write: 2s + # write: 6s ## Idle timeout. # idle: 30s diff --git a/internal/configuration/schema/server.go b/internal/configuration/schema/server.go index 57073ab1a..c6ad3e5d5 100644 --- a/internal/configuration/schema/server.go +++ b/internal/configuration/schema/server.go @@ -42,8 +42,8 @@ var DefaultServerConfiguration = ServerConfiguration{ Write: 4096, }, Timeouts: ServerTimeouts{ - Read: time.Second * 2, - Write: time.Second * 2, + Read: time.Second * 6, + Write: time.Second * 6, Idle: time.Second * 30, }, } diff --git a/internal/configuration/schema/telemetry.go b/internal/configuration/schema/telemetry.go index 3de20bc3d..3b0dcf3b5 100644 --- a/internal/configuration/schema/telemetry.go +++ b/internal/configuration/schema/telemetry.go @@ -28,8 +28,8 @@ var DefaultTelemetryConfig = TelemetryConfig{ Write: 4096, }, Timeouts: ServerTimeouts{ - Read: time.Second * 2, - Write: time.Second * 2, + Read: time.Second * 6, + Write: time.Second * 6, Idle: time.Second * 30, }, }, diff --git a/internal/server/server.go b/internal/server/server.go index 37e6f6a79..760cbe50e 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -28,7 +28,7 @@ func CreateDefaultServer(config schema.Configuration, providers middlewares.Prov ReadTimeout: config.Server.Timeouts.Read, WriteTimeout: config.Server.Timeouts.Write, IdleTimeout: config.Server.Timeouts.Idle, - Logger: logging.LoggerPrintf(logrus.WarnLevel), + Logger: logging.LoggerPrintf(logrus.DebugLevel), } address := net.JoinHostPort(config.Server.Host, strconv.Itoa(config.Server.Port))