diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-02-02 09:32:00 -0500 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-02-02 09:32:00 -0500 |
| commit | 701d1ab638b23c24877fc41824add66232446676 (patch) | |
| tree | ec120c88d38ac9d38d9eabdd3270b52bb6ac9d96 /vendor/github.com/tylerb | |
| parent | ca3211bc04f6dea34e8168217182637d1419f998 (diff) | |
| download | chat-701d1ab638b23c24877fc41824add66232446676.tar.gz chat-701d1ab638b23c24877fc41824add66232446676.tar.bz2 chat-701d1ab638b23c24877fc41824add66232446676.zip | |
Updating server dependancies (#5249)
Diffstat (limited to 'vendor/github.com/tylerb')
| -rw-r--r-- | vendor/github.com/tylerb/graceful/graceful.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/vendor/github.com/tylerb/graceful/graceful.go b/vendor/github.com/tylerb/graceful/graceful.go index 07c990489..d6a9ca068 100644 --- a/vendor/github.com/tylerb/graceful/graceful.go +++ b/vendor/github.com/tylerb/graceful/graceful.go @@ -172,10 +172,12 @@ func (srv *Server) ListenTLS(certFile, keyFile string) (net.Listener, error) { } var err error - config.Certificates = make([]tls.Certificate, 1) - config.Certificates[0], err = tls.LoadX509KeyPair(certFile, keyFile) - if err != nil { - return nil, err + if certFile != "" && keyFile != "" { + config.Certificates = make([]tls.Certificate, 1) + config.Certificates[0], err = tls.LoadX509KeyPair(certFile, keyFile) + if err != nil { + return nil, err + } } // Enable http2 @@ -455,6 +457,8 @@ func (srv *Server) shutdown(shutdown chan chan struct{}, kill chan struct{}) { done := make(chan struct{}) shutdown <- done + srv.stopLock.Lock() + defer srv.stopLock.Unlock() if srv.Timeout > 0 { select { case <-done: |