Skip to content

[fix](web) FE startup fail due to websocket startup #60369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nsivarajan wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −12
Open

[fix](web) FE startup fail due to websocket startup #60369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 30 additions & 12 deletions ...e-core/src/main/java/org/apache/doris/httpv2/config/WebServerFactoryCustomizerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

import org.apache.doris.common.Config;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.eclipse.jetty.ee10.webapp.WebAppContext;
import org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.ServerConnector;
Expand All @@ -31,26 +35,40 @@

@Configuration
public class WebServerFactoryCustomizerConfig implements WebServerFactoryCustomizer<ConfigurableJettyWebServerFactory> {
private static final Logger LOG = LogManager.getLogger(WebServerFactoryCustomizerConfig.class);

@Override
public void customize(ConfigurableJettyWebServerFactory factory) {

((JettyServletWebServerFactory) factory).addServerCustomizers(server -> {
WebAppContext context = server.getDescendant(WebAppContext.class);
if (context != null) {
try {
JettyWebSocketServletContainerInitializer.configure(context, null);
} catch (Exception e) {
LOG.error("Failed to initialize WebSocket support", e);
throw new RuntimeException("Failed to initialize WebSocket support", e);
}
}
});

if (Config.enable_https) {
((JettyServletWebServerFactory) factory).setConfigurations(
Collections.singletonList(new HttpToHttpsJettyConfig())
);

factory.addServerCustomizers(
server -> {
HttpConfiguration httpConfiguration = new HttpConfiguration();
httpConfiguration.setSecurePort(Config.https_port);
httpConfiguration.setSecureScheme("https");

ServerConnector connector = new ServerConnector(server);
connector.addConnectionFactory(new HttpConnectionFactory(httpConfiguration));
connector.setPort(Config.http_port);

server.addConnector(connector);
factory.addServerCustomizers(server -> {
if (server.getConnectors() != null && server.getConnectors().length > 0) {
ServerConnector existingConnector = (ServerConnector) server.getConnectors()[0];
HttpConnectionFactory httpFactory =
existingConnector.getConnectionFactory(HttpConnectionFactory.class);
if (httpFactory != null) {
HttpConfiguration httpConfig = httpFactory.getHttpConfiguration();
httpConfig.setSecurePort(Config.https_port);
httpConfig.setSecureScheme("https");
}
);
}
});
}
}
}
Loading