refactor: adjust defaults (#4137)
* refactor: adjust defaults * refactor: adjust level * refactor: adjust level * refactor: fix templatespull/4139/head
parent
a059843dff
commit
3107e493e7
|
@ -96,10 +96,10 @@ server:
|
||||||
# timeouts:
|
# timeouts:
|
||||||
|
|
||||||
## Read timeout.
|
## Read timeout.
|
||||||
# read: 2s
|
# read: 6s
|
||||||
|
|
||||||
## Write timeout.
|
## Write timeout.
|
||||||
# write: 2s
|
# write: 6s
|
||||||
|
|
||||||
## Idle timeout.
|
## Idle timeout.
|
||||||
# idle: 30s
|
# idle: 30s
|
||||||
|
@ -148,10 +148,10 @@ telemetry:
|
||||||
# timeouts:
|
# timeouts:
|
||||||
|
|
||||||
## Read timeout.
|
## Read timeout.
|
||||||
# read: 2s
|
# read: 6s
|
||||||
|
|
||||||
## Write timeout.
|
## Write timeout.
|
||||||
# write: 2s
|
# write: 6s
|
||||||
|
|
||||||
## Idle timeout.
|
## Idle timeout.
|
||||||
# idle: 30s
|
# idle: 30s
|
||||||
|
|
|
@ -35,8 +35,8 @@ server:
|
||||||
read: 4096
|
read: 4096
|
||||||
write: 4096
|
write: 4096
|
||||||
timeouts:
|
timeouts:
|
||||||
read: 10s
|
read: 6s
|
||||||
write: 10s
|
write: 6s
|
||||||
idle: 10s
|
idle: 10s
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
@ -152,7 +152,7 @@ Configures the maximum response size. The default of 4096 is generally sufficien
|
||||||
|
|
||||||
### read
|
### 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
|
*__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.*
|
[common options](#duration-notation-format) documentation for information on this format.*
|
||||||
|
@ -161,7 +161,7 @@ Configures the server read timeout.
|
||||||
|
|
||||||
### write
|
### 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
|
*__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.*
|
[common options](#duration-notation-format) documentation for information on this format.*
|
||||||
|
|
|
@ -25,8 +25,8 @@ telemetry:
|
||||||
read: 4096
|
read: 4096
|
||||||
write: 4096
|
write: 4096
|
||||||
timeouts:
|
timeouts:
|
||||||
read: 2s
|
read: 6s
|
||||||
write: 2s
|
write: 6s
|
||||||
idle: 30s
|
idle: 30s
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
|
@ -96,10 +96,10 @@ server:
|
||||||
# timeouts:
|
# timeouts:
|
||||||
|
|
||||||
## Read timeout.
|
## Read timeout.
|
||||||
# read: 2s
|
# read: 6s
|
||||||
|
|
||||||
## Write timeout.
|
## Write timeout.
|
||||||
# write: 2s
|
# write: 6s
|
||||||
|
|
||||||
## Idle timeout.
|
## Idle timeout.
|
||||||
# idle: 30s
|
# idle: 30s
|
||||||
|
@ -148,10 +148,10 @@ telemetry:
|
||||||
# timeouts:
|
# timeouts:
|
||||||
|
|
||||||
## Read timeout.
|
## Read timeout.
|
||||||
# read: 2s
|
# read: 6s
|
||||||
|
|
||||||
## Write timeout.
|
## Write timeout.
|
||||||
# write: 2s
|
# write: 6s
|
||||||
|
|
||||||
## Idle timeout.
|
## Idle timeout.
|
||||||
# idle: 30s
|
# idle: 30s
|
||||||
|
|
|
@ -42,8 +42,8 @@ var DefaultServerConfiguration = ServerConfiguration{
|
||||||
Write: 4096,
|
Write: 4096,
|
||||||
},
|
},
|
||||||
Timeouts: ServerTimeouts{
|
Timeouts: ServerTimeouts{
|
||||||
Read: time.Second * 2,
|
Read: time.Second * 6,
|
||||||
Write: time.Second * 2,
|
Write: time.Second * 6,
|
||||||
Idle: time.Second * 30,
|
Idle: time.Second * 30,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,8 +28,8 @@ var DefaultTelemetryConfig = TelemetryConfig{
|
||||||
Write: 4096,
|
Write: 4096,
|
||||||
},
|
},
|
||||||
Timeouts: ServerTimeouts{
|
Timeouts: ServerTimeouts{
|
||||||
Read: time.Second * 2,
|
Read: time.Second * 6,
|
||||||
Write: time.Second * 2,
|
Write: time.Second * 6,
|
||||||
Idle: time.Second * 30,
|
Idle: time.Second * 30,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -28,7 +28,7 @@ func CreateDefaultServer(config schema.Configuration, providers middlewares.Prov
|
||||||
ReadTimeout: config.Server.Timeouts.Read,
|
ReadTimeout: config.Server.Timeouts.Read,
|
||||||
WriteTimeout: config.Server.Timeouts.Write,
|
WriteTimeout: config.Server.Timeouts.Write,
|
||||||
IdleTimeout: config.Server.Timeouts.Idle,
|
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))
|
address := net.JoinHostPort(config.Server.Host, strconv.Itoa(config.Server.Port))
|
||||||
|
|
Loading…
Reference in New Issue