Code clean up

This commit is contained in:
NI
2020-04-06 18:56:59 +08:00
parent d8a599baf9
commit bc7f20ebef

View File

@@ -19,7 +19,6 @@ package server
import ( import (
"context" "context"
"crypto/tls"
"errors" "errors"
goLog "log" goLog "log"
"net" "net"
@@ -93,6 +92,7 @@ func (s Server) Serve(
ss := &Serving{ ss := &Serving{
server: http.Server{ server: http.Server{
Handler: handlerBuilder(commonCfg, ssCfg, l), Handler: handlerBuilder(commonCfg, ssCfg, l),
TLSConfig: nil,
ReadTimeout: ssCfg.ReadTimeout, ReadTimeout: ssCfg.ReadTimeout,
ReadHeaderTimeout: ssCfg.InitialTimeout, ReadHeaderTimeout: ssCfg.InitialTimeout,
WriteTimeout: ssCfg.WriteTimeout, WriteTimeout: ssCfg.WriteTimeout,
@@ -196,10 +196,6 @@ func (s *Serving) run(
logger.Info("Serving TLS") logger.Info("Serving TLS")
if s.server.TLSConfig != nil {
s.server.TLSConfig.MinVersion = tls.VersionTLS12
}
err = s.server.ServeTLS( err = s.server.ServeTLS(
ls, cfg.TLSCertificateFile, cfg.TLSCertificateKeyFile) ls, cfg.TLSCertificateFile, cfg.TLSCertificateKeyFile)