support http service graceful restart

go-gitea · Dec 30, 2016 · 3bbbab3 · 3bbbab3
1 parent 42904cb
commit 3bbbab3
Show file tree

Hide file tree

Showing 5 changed files with 278 additions and 3 deletions.
diff --git a/cmd/web.go b/cmd/web.go
@@ -31,6 +31,7 @@ import (
 	"code.gitea.io/gitea/routers/repo"
 	"code.gitea.io/gitea/routers/user"
 
+	"github.com/facebookgo/grace/gracehttp"
 	"github.com/go-macaron/binding"
 	"github.com/go-macaron/cache"
 	"github.com/go-macaron/captcha"
@@ -615,10 +616,29 @@ func runWeb(ctx *cli.Context) error {
 	var err error
 	switch setting.Protocol {
 	case setting.HTTP:
-		err = http.ListenAndServe(listenAddr, m)
+		err = gracehttp.Serve(&http.Server{
+			Addr:    listenAddr,
+			Handler: m,
+		})
 	case setting.HTTPS:
-		server := &http.Server{Addr: listenAddr, TLSConfig: &tls.Config{MinVersion: tls.VersionTLS10}, Handler: m}
-		err = server.ListenAndServeTLS(setting.CertFile, setting.KeyFile)
+		config := &tls.Config{
+			MinVersion: tls.VersionTLS10,
+		}
+		if config.NextProtos == nil {
+			config.NextProtos = []string{"http/1.1"}
+		}
+
+		config.Certificates = make([]tls.Certificate, 1)
+		config.Certificates[0], err = tls.LoadX509KeyPair(setting.CertFile, setting.KeyFile)
+		if err != nil {
+			log.Fatal(4, "Failed to load https cert file %s: %v", listenAddr, err)
+		}
+
+		err = gracehttp.Serve(&http.Server{
+			Addr:      listenAddr,
+			Handler:   m,
+			TLSConfig: config,
+		})
 	case setting.FCGI:
 		err = fcgi.Serve(nil, m)
 	case setting.UnixSocket:

diff --git a/vendor/github.com/facebookgo/grace/gracehttp/http.go b/vendor/github.com/facebookgo/grace/gracehttp/http.go
diff --git a/vendor/github.com/facebookgo/grace/license b/vendor/github.com/facebookgo/grace/license
diff --git a/vendor/github.com/facebookgo/grace/patents b/vendor/github.com/facebookgo/grace/patents
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -92,6 +92,12 @@
 			"revision": "57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2",
 			"revisionTime": "2015-12-24T04:54:52Z"
 		},
+		{
+			"checksumSHA1": "al8G84fPO2HjlLiCGyZZqBVDTI0=",
+			"path": "github.com/facebookgo/grace/gracehttp",
+			"revision": "053ab5d25436faedf3fe76fbf3da797c8c27c659",
+			"revisionTime": "2015-08-07T21:49:31Z"
+		},
 		{
 			"checksumSHA1": "qTJizMr1DBhDTZiRNmC+khEClz8=",
 			"path": "github.com/go-macaron/bindata",