root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #39052 from okohub 

* pr/39052:
  Polish "Fix Jetty ConnectionLimit configuration"
  Fix Jetty ConnectionLimit configuration

Closes gh-39052
This commit is contained in:
Moritz Halbritter 2024-01-10 10:18:01 +01:00
parent 793801b9cb 66dc72da46
commit 47564ccea1
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactory.java
View File

@ -116,6 +116,7 @@ import org.springframework.util.StringUtils;
* @author Venil Noronha * @author Venil Noronha
* @author Henri Kerola * @author Henri Kerola
* @author Moritz Halbritter * @author Moritz Halbritter
* @author Onur Kagan Ozcan
* @since 2.0.0 * @since 2.0.0
* @see #setPort(int) * @see #setPort(int)
* @see #setConfigurations(Collection) * @see #setConfigurations(Collection)
@ -183,7 +184,7 @@ public class JettyServletWebServerFactory extends AbstractServletWebServerFactor
server.setHandler(addHandlerWrappers(context)); server.setHandler(addHandlerWrappers(context));
this.logger.info("Server initialized with port: " + port); this.logger.info("Server initialized with port: " + port);
if (this.maxConnections > -1) { if (this.maxConnections > -1) {
server.addBean(new ConnectionLimit(this.maxConnections, server)); server.addBean(new ConnectionLimit(this.maxConnections, server.getConnectors()));
} }
if (Ssl.isEnabled(getSsl())) { if (Ssl.isEnabled(getSsl())) {
customizeSsl(server, address); customizeSsl(server, address);

16
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/JettyServletWebServerFactoryTests.java
View File

@ -39,6 +39,7 @@ import org.apache.hc.client5.http.impl.classic.HttpClients;
import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpResponse;
import org.apache.jasper.servlet.JspServlet; import org.apache.jasper.servlet.JspServlet;
import org.assertj.core.api.InstanceOfAssertFactories;
import org.awaitility.Awaitility; import org.awaitility.Awaitility;
import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler; import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler;
import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.jetty.ee10.servlet.ServletHolder;
@ -46,6 +47,7 @@ import org.eclipse.jetty.ee10.webapp.AbstractConfiguration;
import org.eclipse.jetty.ee10.webapp.ClassMatcher; import org.eclipse.jetty.ee10.webapp.ClassMatcher;
import org.eclipse.jetty.ee10.webapp.Configuration; import org.eclipse.jetty.ee10.webapp.Configuration;
import org.eclipse.jetty.ee10.webapp.WebAppContext; import org.eclipse.jetty.ee10.webapp.WebAppContext;
import org.eclipse.jetty.server.AbstractConnector;
import org.eclipse.jetty.server.ConnectionLimit; import org.eclipse.jetty.server.ConnectionLimit;
import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Handler;
@ -85,6 +87,7 @@ import static org.mockito.Mockito.mock;
* @author Andy Wilkinson * @author Andy Wilkinson
* @author Henri Kerola * @author Henri Kerola
* @author Moritz Halbritter * @author Moritz Halbritter
* @author Onur Kagan Ozcan
*/ */
class JettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryTests { class JettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryTests {
@ -541,6 +544,19 @@ class JettyServletWebServerFactoryTests extends AbstractServletWebServerFactoryT
assertThat(connectionLimit.getMaxConnections()).isOne(); assertThat(connectionLimit.getMaxConnections()).isOne();
} }
@Test
void shouldApplyingMaxConnectionUseConnector() throws Exception {
JettyServletWebServerFactory factory = getFactory();
factory.setMaxConnections(1);
this.webServer = factory.getWebServer();
Server server = ((JettyWebServer) this.webServer).getServer();
assertThat(server.getConnectors()).isEmpty();
ConnectionLimit connectionLimit = server.getBean(ConnectionLimit.class);
assertThat(connectionLimit).extracting("_connectors")
.asInstanceOf(InstanceOfAssertFactories.list(AbstractConnector.class))
.hasSize(1);
}
@Override @Override
protected String startedLogMessage() { protected String startedLogMessage() {
return ((JettyWebServer) this.webServer).getStartedLogMessage(); return ((JettyWebServer) this.webServer).getStartedLogMessage();