Skip to content

The Unified and Autonomous Development Platform

chore: Improved websocket session handling logic

Robin Shen8c45f62e3313
diff --git a/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.java b/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.java
index 8128a2b9c9..31180e7ea0 100644
--- a/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.java
+++ b/server-core/src/main/java/io/onedev/server/web/DefaultWicketServlet.java
@@ -1,8 +1,6 @@
package io.onedev.server.web;
-import io.onedev.server.persistence.SessionService;
-import org.apache.wicket.protocol.http.WicketFilter;
-import org.apache.wicket.protocol.http.WicketServlet;
+import java.io.IOException;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -10,7 +8,11 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+
+import org.apache.wicket.protocol.http.WicketFilter;
+import org.apache.wicket.protocol.http.WicketServlet;
+
+import io.onedev.server.persistence.SessionService;
@Singleton
public class DefaultWicketServlet extends WicketServlet {
@@ -45,7 +47,7 @@ public class DefaultWicketServlet extends WicketServlet {
// Disable cloudflare suggested prefetch to fix OD-2120
httpRes.setHeader("Speculation-Rules", "\"/prefetch.json\"");
try {
- super.service(req, res);
+ DefaultWicketServlet.super.service(req, res);
} catch (ServletException | IOException e) {
throw new RuntimeException(e);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java b/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
index 8ef67bc18d..623e3ddc1b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/status/BuildStatusIcon.java
@@ -1,19 +1,21 @@
package io.onedev.server.web.component.build.status;
-import com.google.common.collect.Sets;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.Build.Status;
-import io.onedev.server.web.behavior.ChangeObserver;
-import io.onedev.server.web.component.svg.SpriteImage;
+import java.util.Collection;
+
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-
import org.jspecify.annotations.Nullable;
-import java.util.Collection;
+
+import com.google.common.collect.Sets;
+
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Build.Status;
+import io.onedev.server.web.behavior.ChangeObserver;
+import io.onedev.server.web.component.svg.SpriteImage;
public class BuildStatusIcon extends SpriteImage {
diff --git a/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java b/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java
index 48a1870663..a5e1c08706 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/WicketUtils.java
@@ -128,6 +128,10 @@ public class WicketUtils {
}
return null;
}
+
+ public static String getRequestLockName(String sessionId) {
+ return "web-request:" + sessionId;
+ }
public static boolean isDevice() {
HttpServletRequest request = (HttpServletRequest) RequestCycle.get().getRequest().getContainerRequest();
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketConnection.java b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketConnection.java
index 4250fe0df4..f6f420c8c5 100644
--- a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketConnection.java
+++ b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketConnection.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.LinkedHashSet;
import java.util.Set;
+import java.util.concurrent.ExecutorService;
import org.apache.shiro.subject.Subject;
import org.apache.shiro.util.ThreadContext;
@@ -119,7 +120,8 @@ public class WebSocketConnection implements IWebSocketConnection {
if (!messageQueue.isEmpty() && !working) {
ThreadContext.bind(subject);
working = true;
- OneDev.getInstance(SessionService.class).runAsync(new Runnable() {
+
+ OneDev.getInstance(ExecutorService.class).execute(new Runnable() {
@Nullable
private IWebSocketPushMessage getNextMessage() {
@@ -141,7 +143,17 @@ public class WebSocketConnection implements IWebSocketConnection {
while (true) {
IWebSocketPushMessage message = getNextMessage();
if (message != null) {
- webSocketProcessor.broadcastMessage(message);
+ /*
+ * Process each message in a separate session to make sure database entities
+ * are refreshed
+ */
+ OneDev.getInstance(SessionService.class).run(new Runnable() {
+
+ @Override
+ public void run() {
+ webSocketProcessor.broadcastMessage(message);
+ }
+ });
} else {
break;
}
@@ -158,7 +170,7 @@ public class WebSocketConnection implements IWebSocketConnection {
}
}
}
- });
+ });
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java
index 13b07bc371..8f84c1e4d8 100644
--- a/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java
@@ -29,7 +29,6 @@ import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.commons.loader.AppLoader;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.server.OneDev;
import io.onedev.server.persistence.SessionService;
@@ -75,10 +74,10 @@ public class WebSocketProcessor extends AbstractWebSocketProcessor implements We
private void run(Runnable runnable) {
if (OneDev.getInstance().isReady()) {
- SessionService sessionService = AppLoader.getInstance(SessionService.class);
+ SessionService sessionService = OneDev.getInstance(SessionService.class);
Subject subject = (Subject) request.getHttpServletRequest().getAttribute(WebSocketFilter.SHIRO_SUBJECT);
- ThreadContext.bind(subject);
- sessionService.run(runnable);
+ ThreadContext.bind(subject);
+ sessionService.run(runnable);
}
}