From 0382146c6015b3a4cc482443594f73e45f4abbee Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 29 Jan 2016 13:11:11 +0800 Subject: [PATCH] fix the go vet for go tip --- config.go | 2 +- grace/server.go | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/config.go b/config.go index 7e2b3ee7..ffe92f06 100644 --- a/config.go +++ b/config.go @@ -319,7 +319,7 @@ func LoadAppConfig(adapterName, configPath string) error { } if !utils.FileExists(absConfigPath) { - return fmt.Errorf("the target config file: %s don't exist!", configPath) + return fmt.Errorf("the target config file: %s don't exist", configPath) } if absConfigPath == appConfigPath { diff --git a/grace/server.go b/grace/server.go index f4512ded..101bda56 100644 --- a/grace/server.go +++ b/grace/server.go @@ -90,16 +90,15 @@ func (srv *Server) ListenAndServeTLS(certFile, keyFile string) (err error) { addr = ":https" } - config := &tls.Config{} - if srv.TLSConfig != nil { - *config = *srv.TLSConfig + if srv.TLSConfig == nil { + srv.TLSConfig = &tls.Config{} } - if config.NextProtos == nil { - config.NextProtos = []string{"http/1.1"} + if srv.TLSConfig.NextProtos == nil { + srv.TLSConfig.NextProtos = []string{"http/1.1"} } - config.Certificates = make([]tls.Certificate, 1) - config.Certificates[0], err = tls.LoadX509KeyPair(certFile, keyFile) + srv.TLSConfig.Certificates = make([]tls.Certificate, 1) + srv.TLSConfig.Certificates[0], err = tls.LoadX509KeyPair(certFile, keyFile) if err != nil { return } @@ -113,7 +112,7 @@ func (srv *Server) ListenAndServeTLS(certFile, keyFile string) (err error) { } srv.tlsInnerListener = newGraceListener(l, srv) - srv.GraceListener = tls.NewListener(srv.tlsInnerListener, config) + srv.GraceListener = tls.NewListener(srv.tlsInnerListener, srv.TLSConfig) if srv.isChild { process, err := os.FindProcess(os.Getppid())