Merge pull request #28 from acoshift/fix-graceful

fix graceful shutdown
moonrhythm · May 18, 2018 · 0586f7f · 0586f7f
2 parents c4b2195 + ae8b9ae
commit 0586f7f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/app.go b/app.go
@@ -101,26 +101,34 @@ func (app *App) configServer(addr string) {
 	app.srv.Addr = addr
 }
 
-// ListenAndServe starts web server
-func (app *App) ListenAndServe(addr string) error {
+func (app *App) listenAndServe(addr string) error {
+	app.configServer(addr)
+
+	return app.srv.ListenAndServe()
+}
+
+func (app *App) listenAndServeTLS(addr, certFile, keyFile string) error {
 	app.configServer(addr)
 
+	return app.srv.ListenAndServeTLS(certFile, keyFile)
+}
+
+// ListenAndServe starts web server
+func (app *App) ListenAndServe(addr string) error {
 	if app.gracefulShutdown != nil {
 		return app.GracefulShutdown().ListenAndServe(addr)
 	}
 
-	return app.srv.ListenAndServe()
+	return app.listenAndServe(addr)
 }
 
 // ListenAndServeTLS starts web server in tls mode
 func (app *App) ListenAndServeTLS(addr, certFile, keyFile string) error {
-	app.configServer(addr)
-
 	if app.gracefulShutdown != nil {
 		return app.GracefulShutdown().ListenAndServeTLS(addr, certFile, keyFile)
 	}
 
-	return app.srv.ListenAndServeTLS(certFile, keyFile)
+	return app.listenAndServeTLS(addr, certFile, keyFile)
 }
 
 // GracefulShutdown returns graceful shutdown server

diff --git a/graceful.go b/graceful.go
@@ -94,10 +94,10 @@ func (gs *GracefulShutdown) start(listenAndServe func() error) (err error) {
 
 // ListenAndServe starts web server in graceful shutdown mode
 func (gs *GracefulShutdown) ListenAndServe(addr string) error {
-	return gs.start(func() error { return gs.App.ListenAndServe(addr) })
+	return gs.start(func() error { return gs.App.listenAndServe(addr) })
 }
 
 // ListenAndServeTLS starts web server in graceful shutdown and tls mode
 func (gs *GracefulShutdown) ListenAndServeTLS(addr, certFile, keyFile string) error {
-	return gs.start(func() error { return gs.App.ListenAndServeTLS(addr, certFile, keyFile) })
+	return gs.start(func() error { return gs.App.listenAndServeTLS(addr, certFile, keyFile) })
 }