idan/sshwifty-udp-telnet-http
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calculate HeartbeatTimeout configuration in the right way.

Browse Source
This commit is contained in:
NI
2019-08-10 14:54:18 +08:00
parent 28df57b3d7
commit 4f0d899346
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/configuration/config.go
View File

@@ -64,6 +64,14 @@ func (s Server) maxDur(cur, def time.Duration) time.Duration {
return def return def
} }
func (s Server) minDur(cur, def time.Duration) time.Duration {
if cur < def {
return cur
}
return def
}
// WithDefault build the configuration and fill the blank with default values // WithDefault build the configuration and fill the blank with default values
func (s Server) WithDefault() Server { func (s Server) WithDefault() Server {
initialTimeout := s.maxDur(s.InitialTimeout, 1*time.Second) initialTimeout := s.maxDur(s.InitialTimeout, 1*time.Second)
@@ -77,7 +85,7 @@ func (s Server) WithDefault() Server {
InitialTimeout: initialTimeout, InitialTimeout: initialTimeout,
ReadTimeout: readTimeout, ReadTimeout: readTimeout,
WriteTimeout: s.maxDur(s.WriteTimeout, 3*time.Second), WriteTimeout: s.maxDur(s.WriteTimeout, 3*time.Second),
HeartbeatTimeout: s.maxDur(s.ReadTimeout, readTimeout/2), HeartbeatTimeout: s.minDur(s.HeartbeatTimeout, readTimeout/2),
ReadDelay: s.ReadDelay, ReadDelay: s.ReadDelay,
WriteDelay: s.WriteDelay, WriteDelay: s.WriteDelay,
TLSCertificateFile: s.TLSCertificateFile, TLSCertificateFile: s.TLSCertificateFile,