From fbb4f33b181ec0b06f78f68dabc63cf1533b7573 Mon Sep 17 00:00:00 2001 From: t-tsutsumi Date: Sat, 29 Apr 2017 20:31:04 +0900 Subject: [PATCH 1/2] Graceful shutdown on Jetty requires StatisticsHandler --- src/main/java/JettyLauncher.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/JettyLauncher.java b/src/main/java/JettyLauncher.java index 04ae950c6..a1a04bde3 100644 --- a/src/main/java/JettyLauncher.java +++ b/src/main/java/JettyLauncher.java @@ -1,4 +1,6 @@ +import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.StatisticsHandler; import org.eclipse.jetty.webapp.WebAppContext; import java.io.File; @@ -93,7 +95,9 @@ public class JettyLauncher { context.setInitParameter("org.scalatra.ForceHttps", "true"); } - server.setHandler(context); + Handler handler = addStatisticsHandler(context); + + server.setHandler(handler); server.setStopAtShutdown(true); server.setStopTimeout(7_000); server.start(); @@ -122,4 +126,12 @@ public class JettyLauncher { } dir.delete(); } + + private static Handler addStatisticsHandler(Handler handler) { + // The graceful shutdown is implemented via the statistics handler. + // See the following: https://bugs.eclipse.org/bugs/show_bug.cgi?id=420142 + final StatisticsHandler statisticsHandler = new StatisticsHandler(); + statisticsHandler.setHandler(handler); + return statisticsHandler; + } } From 18fa77a25c38863186fe0105a9de1ac6197d55e1 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 30 Apr 2017 00:27:24 +0900 Subject: [PATCH 2/2] Fixup --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e13546ef3..feadf3aee 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -0;95;0cGitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.png)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket) +GitBucket [![Gitter chat](https://badges.gitter.im/gitbucket/gitbucket.png)](https://gitter.im/gitbucket/gitbucket) [![Build Status](https://travis-ci.org/gitbucket/gitbucket.svg?branch=master)](https://travis-ci.org/gitbucket/gitbucket) ========= GitBucket is a Git web platform powered by Scala offering: