mirror of
				https://github.com/gitbucket/gitbucket.git
				synced 2025-10-31 10:36:05 +01:00 
			
		
		
		
	Merge branch 'master' into pr/disabling-server-header
This commit is contained in:
		| @@ -1,6 +1,8 @@ | ||||
| import org.eclipse.jetty.server.Connector; | ||||
| import org.eclipse.jetty.server.Handler; | ||||
| import org.eclipse.jetty.server.HttpConnectionFactory; | ||||
| import org.eclipse.jetty.server.Server; | ||||
| import org.eclipse.jetty.server.handler.StatisticsHandler; | ||||
| import org.eclipse.jetty.webapp.WebAppContext; | ||||
|  | ||||
| import java.io.File; | ||||
| @@ -102,7 +104,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(); | ||||
| @@ -131,4 +135,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; | ||||
|     } | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user