Skip to content

add http2 connector for better sse support #583

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
thmarx wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −5
Open

add http2 connector for better sse support #583

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions cms-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.compression</groupId>
<artifactId>jetty-compression-server</artifactId>
Expand Down
4 changes: 3 additions & 1 deletion cms-server/src/main/java/com/condation/cms/server/JettyServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import org.eclipse.jetty.compression.server.CompressionConfig;
import org.eclipse.jetty.compression.server.CompressionHandler;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory;
import org.eclipse.jetty.server.CustomRequestLog;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
Expand Down Expand Up @@ -171,6 +172,7 @@ public void startup() throws IOException {
httpConfig.setSendServerVersion(false);
httpConfig.setSendXPoweredBy(false);
HttpConnectionFactory http11 = new HttpConnectionFactory(httpConfig);
HTTP2CServerConnectionFactory h2c = new HTTP2CServerConnectionFactory(httpConfig);

//QueuedThreadPool threadPool = new QueuedThreadPool(properties.performance().request_workers());
QueuedThreadPool threadPool = new QueuedThreadPool();
Expand All @@ -180,7 +182,7 @@ public void startup() throws IOException {
server = new Server(threadPool);
server.setRequestLog(new CustomRequestLog(new Slf4jRequestLogWriter(), CustomRequestLog.EXTENDED_NCSA_FORMAT));

ServerConnector connector = new ServerConnector(server, http11);
ServerConnector connector = new ServerConnector(server, http11, h2c);
connector.setPort(properties.serverPort());
connector.setHost(properties.serverIp());

Expand Down
15 changes: 11 additions & 4 deletions modules/ui-module/src/main/java/com/condation/cms/modules/ui/http/RemoteCallHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.condation.cms.api.module.SiteRequestContext;
import com.condation.cms.api.ui.rpc.RPCError;
import com.condation.cms.api.ui.rpc.RPCResult;
import com.condation.cms.auth.services.User;
import com.condation.cms.modules.ui.model.RemoteCall;
import com.condation.cms.modules.ui.services.RemoteMethodService;
import com.condation.cms.modules.ui.utils.json.UIGsonProvider;
Expand Down Expand Up @@ -63,12 +64,18 @@ public boolean handle(Request request, Response response, Callback callback) thr

RPCResult rpcResult;
try {
Optional<?> result = remoteCallService.execute(remoteCall.method(), remoteCall.parameters(), getUser(request, moduleContext, requestContext).get());
if (result.isPresent()) {
rpcResult = new RPCResult(result.get());
final Optional<User> userOpt = getUser(request, moduleContext, requestContext);
if (userOpt.isEmpty()) {
rpcResult = new RPCResult(new RPCError("no user present"));
} else {
rpcResult = new RPCResult();
Optional<?> result = remoteCallService.execute(remoteCall.method(), remoteCall.parameters(), userOpt.get());
if (result.isPresent()) {
rpcResult = new RPCResult(result.get());
} else {
rpcResult = new RPCResult();
}
}

} catch (Exception e) {
log.error("error executing endpoint", remoteCall.method(), e);
rpcResult = new RPCResult(new RPCError(e.getMessage()));
Expand Down
5 changes: 5 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,11 @@
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>jetty-http2-server</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
Expand Down