Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Sep 10, 2019 · effaa2c · effaa2c
2 parents 73f184a + a2412e7
commit effaa2c
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
@@ -11,6 +11,7 @@
 import com.evolveum.midpoint.gui.impl.registry.GuiComponentRegistryImpl;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
+import org.apache.catalina.Context;
 import org.apache.catalina.Valve;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +23,7 @@
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryCustomizer;
 import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.embedded.tomcat.TomcatContextCustomizer;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.server.ErrorPage;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
@@ -36,6 +38,8 @@
 
 import java.lang.management.ManagementFactory;
 import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by Viliam Repan (lazyman).
@@ -138,6 +142,8 @@ public class ServerCustomization implements WebServerFactoryCustomizer<Configura
 
     	@Value("${server.servlet.session.timeout}")
     	private int sessionTimeout;
+		@Value("${server.tomcat.background-processor-delay:10}")
+		private int backgroundProcessorDelay;
     	@Value("${server.servlet.context-path}")
 		private String servletPath;
 
@@ -171,6 +177,17 @@ public void customize(ConfigurableServletWebServerFactory server) {
     	}
 
     	private void customizeTomcat(TomcatServletWebServerFactory tomcatFactory) {
+			// Set background-processor-delay property.
+			TomcatContextCustomizer contextCustomizer = new TomcatContextCustomizer() {
+				@Override
+				public void customize(Context context) {
+					context.setBackgroundProcessorDelay(backgroundProcessorDelay);
+				}
+			};
+			List<TomcatContextCustomizer> contextCustomizers = new ArrayList<TomcatContextCustomizer>();
+			contextCustomizers.add(contextCustomizer);
+			tomcatFactory.setTomcatContextCustomizers(contextCustomizers);
+
     		// Tomcat valve used to redirect root URL (/) to real application URL (/midpoint/).
     		// See comments in TomcatRootValve
     		Valve rootValve = new TomcatRootValve(servletPath);