Some later refactorings

README.md

@@ -6,7 +6,7 @@ Manners allows you to shut your Go webserver down gracefully, without dropping a
 
 ```go
 func main() {
-  handler = MyHTTPHandler()
+  handler := MyHTTPHandler()
   signal.Notify(manners.ShutdownChannel)
   manners.ListenAndServe(handler, ":7000")
 }

listener.go

@@ -1,13 +1,11 @@
 package manners
 
-import (
-  "net"
-)
+import "net"
 
 // A GracefulListener differs from a standard net.Listener in three ways:
 //    1. It increases the server's WaitGroup when it accepts a connection.
 //    2. It returns GracefulConnections rather than normal net.Conns.
-//    3. If Accept() is called after it is gracefully closed, it returns a 
+//    3. If Accept() is called after it is gracefully closed, it returns a
 //       listenerAlreadyClosed error. The GracefulServer will ignore this
 //       error.
 type GracefulListener struct {

server.go

@@ -7,15 +7,15 @@ import (
 )
 
 func NewServer() *GracefulServer {
-  return &GracefulServer{
-    shutdown: make(chan bool),
-  }
+	return &GracefulServer{
+		shutdown: make(chan bool),
+	}
 }
 
 type GracefulServer struct {
 	wg              sync.WaitGroup
 	shutdown        chan bool
-	shutdownHandler func() error
+	shutdownHandler func()
 }
 
 func (s *GracefulServer) ListenAndServe(addr string, handler http.Handler) error {
@@ -29,8 +29,8 @@ func (s *GracefulServer) ListenAndServe(addr string, handler http.Handler) error
 }
 
 func (s *GracefulServer) Serve(listener *GracefulListener, handler http.Handler) error {
-	s.shutdownHandler = func() error { return listener.Close() }
-  s.WaitForShutdown()
+	s.shutdownHandler = func() { listener.Close() }
+	s.listenForShutdown()
 	server := http.Server{Handler: handler}
 	err := server.Serve(listener)
 	if err == nil {
@@ -49,12 +49,9 @@ func (s *GracefulServer) FinishRoutine() {
 	s.wg.Done()
 }
 
-func (s *GracefulServer) WaitForShutdown() chan error {
-  errs := make(chan error)
-  go func() {
-    <-s.shutdown
-    err := s.shutdownHandler()
-    errs <-err
-  }()
-  return errs
+func (s *GracefulServer) listenForShutdown() {
+	go func() {
+		<-s.shutdown
+		s.shutdownHandler()
+	}()
 }