Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-09 23:15:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1563 from t-tsutsumi/pr/fix-graceful-shutdown

Browse Source 
Graceful shutdown on Jetty requires StatisticsHandler
This commit is contained in:
Naoki Takezoe
2017-04-30 01:37:32 +09:00
committed by GitHub
parent 18fa77a25c fbb4f33b18
commit 458f1521b6
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/JettyLauncher.java
View File

@@ -1,4 +1,6 @@
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.StatisticsHandler;
import org.eclipse.jetty.webapp.WebAppContext; import org.eclipse.jetty.webapp.WebAppContext;
import java.io.File; import java.io.File;
@@ -93,7 +95,9 @@ public class JettyLauncher {
context.setInitParameter("org.scalatra.ForceHttps", "true"); context.setInitParameter("org.scalatra.ForceHttps", "true");
} }
server.setHandler(context); Handler handler = addStatisticsHandler(context);
server.setHandler(handler);
server.setStopAtShutdown(true); server.setStopAtShutdown(true);
server.setStopTimeout(7_000); server.setStopTimeout(7_000);
server.start(); server.start();
@@ -122,4 +126,12 @@ public class JettyLauncher {
} }
dir.delete(); 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;
}
} }