Merge branch v2.10 into v3.0
This commit is contained in:
commit
606281a4a5
20 changed files with 196 additions and 73 deletions
|
@ -842,7 +842,7 @@ func checkTCPTLS(addr string, timeout time.Duration, tlsVersion uint16) (err err
|
|||
|
||||
err = conn.SetReadDeadline(time.Now().Add(timeout))
|
||||
if err != nil {
|
||||
return
|
||||
return err
|
||||
}
|
||||
|
||||
var buf bytes.Buffer
|
||||
|
|
|
@ -73,6 +73,7 @@ func (s *Server) Wait() {
|
|||
|
||||
// Stop stops the server.
|
||||
func (s *Server) Stop() {
|
||||
//nolint:zerologlint // false-positive https://github.com/ykadowak/zerologlint/issues/3
|
||||
defer log.Info().Msg("Server stopped")
|
||||
|
||||
s.tcpEntryPoints.Stop()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue