summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/braintree/manners/static.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/braintree/manners/static.go')
-rw-r--r--vendor/github.com/braintree/manners/static.go14
1 files changed, 1 insertions, 13 deletions
diff --git a/vendor/github.com/braintree/manners/static.go b/vendor/github.com/braintree/manners/static.go
index b53950675..2a74b094b 100644
--- a/vendor/github.com/braintree/manners/static.go
+++ b/vendor/github.com/braintree/manners/static.go
@@ -3,23 +3,14 @@ package manners
import (
"net"
"net/http"
- "sync"
)
-var (
- defaultServer *GracefulServer
- defaultServerLock = &sync.Mutex{}
-)
-
-func init() {
- defaultServerLock.Lock()
-}
+var defaultServer *GracefulServer
// ListenAndServe provides a graceful version of the function provided by the
// net/http package. Call Close() to stop the server.
func ListenAndServe(addr string, handler http.Handler) error {
defaultServer = NewWithServer(&http.Server{Addr: addr, Handler: handler})
- defaultServerLock.Unlock()
return defaultServer.ListenAndServe()
}
@@ -27,7 +18,6 @@ func ListenAndServe(addr string, handler http.Handler) error {
// net/http package. Call Close() to stop the server.
func ListenAndServeTLS(addr string, certFile string, keyFile string, handler http.Handler) error {
defaultServer = NewWithServer(&http.Server{Addr: addr, Handler: handler})
- defaultServerLock.Unlock()
return defaultServer.ListenAndServeTLS(certFile, keyFile)
}
@@ -35,13 +25,11 @@ func ListenAndServeTLS(addr string, certFile string, keyFile string, handler htt
// package. Call Close() to stop the server.
func Serve(l net.Listener, handler http.Handler) error {
defaultServer = NewWithServer(&http.Server{Handler: handler})
- defaultServerLock.Unlock()
return defaultServer.Serve(l)
}
// Shuts down the default server used by ListenAndServe, ListenAndServeTLS and
// Serve. It returns true if it's the first time Close is called.
func Close() bool {
- defaultServerLock.Lock()
return defaultServer.Close()
}