Skip to content

The Unified and Autonomous Development Platform

fix: improve workspace defaults and event handling

Robin Shen34b7ea4712e1
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
index b3f7b492a7..a882888dac 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
@@ -203,7 +203,7 @@ public class Job implements NamedElement, Validatable {
return SuggestionUtils.suggest(applicableJobExecutors, matchWith);
}
- @Editable(order=220, description="Shell commands run as the template image's default user. Non-root users need passwordless sudo for containers, services, and protected caches. Opening a build terminal or resuming a paused job needs sudo only when the non-root template user does not own the build directory.")
+ @Editable(order=195, description="Shell commands run as the template image's default user. Non-root users need passwordless sudo for containers, services, and protected caches. Opening a build terminal or resuming a paused job needs sudo only when the non-root template user does not own the build directory.")
@Interpolative(variableSuggester="suggestVariables")
@DependsOn(property="executeInSandbox")
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java b/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java
index f6ba101438..a2fbd27c9c 100644
--- a/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java
+++ b/server-core/src/main/java/io/onedev/server/event/DefaultListenerRegistry.java
@@ -105,9 +105,8 @@ public class DefaultListenerRegistry implements ListenerRegistry, Serializable {
@Override
public void post(Object event) {
- if (event instanceof ProjectEvent) {
- ProjectEvent projectEvent = (ProjectEvent) event;
- Long projectId = projectEvent.getProject().getId();
+ if (event instanceof ProjectEvent projectEvent) {
+ Long projectId = projectEvent.getProjectId();
transactionService.runAfterCommit(() -> projectService.submitToActiveServer(projectId, () -> {
SecurityUtils.bindAsSystem();
try {
@@ -125,9 +124,8 @@ public class DefaultListenerRegistry implements ListenerRegistry, Serializable {
}
return null;
}));
- } else if (event instanceof ProjectDeleted) {
- ProjectDeleted projectDeleted = (ProjectDeleted) event;
- Long projectId = projectDeleted.getProjectId();
+ } else if (event instanceof ProjectDeleted projectDeleted) {
+ Long projectId = projectDeleted.getProjectId();
String activeServer = projectService.getActiveServer(projectId, false);
if (activeServer != null) {
transactionService.runAfterCommit(() -> clusterService.submitToServer(activeServer, () -> {
diff --git a/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java b/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java
index 70022e1aa7..6591b7a928 100644
--- a/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java
@@ -63,6 +63,10 @@ public abstract class ProjectEvent extends Event implements Serializable {
public Project getProject() {
return OneDev.getInstance(ProjectService.class).load(projectId);
}
+
+ public Long getProjectId() {
+ return projectId;
+ }
@Nullable
public User getUser() {
diff --git a/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java b/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java
index 940c0c37fe..644ef4dd4f 100644
--- a/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java
+++ b/server-core/src/main/java/io/onedev/server/logging/DefaultLogService.java
@@ -43,7 +43,6 @@ import io.onedev.server.logging.instruction.LogInstruction;
import io.onedev.server.logging.instruction.LogInstructionParser.InstructionContext;
import io.onedev.server.logging.instruction.LogInstructionParser.ParamContext;
import io.onedev.server.model.Project;
-import io.onedev.server.persistence.SessionService;
import io.onedev.server.persistence.TransactionService;
import io.onedev.server.util.IOUtils;
import io.onedev.server.web.websocket.WebSocketService;
@@ -70,9 +69,6 @@ public class DefaultLogService implements LogService, Serializable {
@Inject
private TransactionService transactionService;
- @Inject
- private SessionService sessionService;
-
private final Map<File, LogSnippet> recentSnippets = new ConcurrentHashMap<>();
private final Map<String, TaskLogger> loggers = new ConcurrentHashMap<>();
@@ -212,7 +208,7 @@ public class DefaultLogService implements LogService, Serializable {
values.add(LogInstruction.getValue(value));
params.put(paramName, values);
}
- sessionService.run(() -> instruction.execute(params));
+ transactionService.run(() -> instruction.execute(params));
return true;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.java
index dedc312660..29f1b29f7e 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/WorkspaceSpec.java
@@ -49,7 +49,7 @@ public class WorkspaceSpec implements Serializable, Validatable {
private String description;
- private ProvisionMode provisionMode = ProvisionMode.HOST;
+ private ProvisionMode provisionMode = ProvisionMode.DOCKER;
private String provisioner;
@@ -164,7 +164,7 @@ public class WorkspaceSpec implements Serializable, Validatable {
return SuggestionUtils.suggest(provisionerNames, matchWith);
}
- @Editable(order = 200, name = "container:image", description = """
+ @Editable(order = 60, name = "container:image", description = """
Specify container image to create workspace inside. Note that this image should
have <a href='https://git-scm.com' target='_blank'>git</a>, <a href='https://git-lfs.com' target='_blank'>git-lfs</a>, <a href='https://curl.se' target='_blank'>curl</a>, and <a href='https://github.com/tmux/tmux' target='_blank'>tmux</a> installed
""")
@@ -179,7 +179,7 @@ public class WorkspaceSpec implements Serializable, Validatable {
this.image = image;
}
- @Editable(order = 210)
+ @Editable(order = 70)
@Interpolative(variableSuggester="suggestVariables")
@DependsOn(property = "provisionMode", value = "SANDBOX")
@NotEmpty