Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-02 19:45:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pr/disabling-server-header

Browse Source
This commit is contained in:
Takuma Tsutsumi
2017-04-30 01:40:51 +09:00
committed by GitHub
parent 518861ac0f 458f1521b6
commit 755419fd56
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -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: GitBucket is a Git web platform powered by Scala offering:

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

@@ -1,6 +1,8 @@
import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.HttpConnectionFactory; import org.eclipse.jetty.server.HttpConnectionFactory;
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;
@@ -102,7 +104,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();
@@ -131,4 +135,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;
}
} }