Skip to content

The Unified and Autonomous Development Platform

fix: Too long error message in build spec validation

Robin Shen8df79104d1bd
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Import.java b/server-core/src/main/java/io/onedev/server/buildspec/Import.java
index a95b358b67..dc817b94db 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/Import.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/Import.java
@@ -24,6 +24,8 @@ import io.onedev.server.web.util.SuggestionUtils;
import io.onedev.server.web.util.WicketUtils;
import org.apache.shiro.subject.Subject;
import org.eclipse.jgit.revwalk.RevCommit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
import javax.validation.ConstraintValidatorContext;
@@ -43,6 +45,8 @@ import java.util.stream.Collectors;
public class Import implements Serializable, Validatable {
private static final long serialVersionUID = 1L;
+
+ private static final Logger logger = LoggerFactory.getLogger(Import.class);
private String projectPath;
@@ -220,8 +224,10 @@ public class Import implements Serializable, Validatable {
} catch (Exception e) {
context.disableDefaultConstraintViolation();
String message = e.getMessage();
- if (message == null)
- message = Throwables.getStackTraceAsString(e);
+ if (message == null) {
+ logger.error("Error validating build spec import", e);
+ message = "Failed to validate build spec import. Check server log for details";
+ }
context.buildConstraintViolationWithTemplate(message).addConstraintViolation();
return false;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
index d4206e7f33..8fe820dfee 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
@@ -67,7 +67,7 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
public BuildSpecBlobViewPanel(String id, BlobRenderContext context) {
super(id, context);
}
-
+
@Override
protected void onInitialize() {
super.onInitialize();