Skip to content

The Unified and Autonomous Development Platform

feat: Introduce ConversionExceptionHandler and enhance logging in DefaultJobService and CommitDetailPage

Robin Shena419e32018dc
diff --git a/server-core/src/main/java/io/onedev/server/exception/handler/ConversionExceptionHandler.java b/server-core/src/main/java/io/onedev/server/exception/handler/ConversionExceptionHandler.java
new file mode 100644
index 0000000000..d1e48bba4a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/exception/handler/ConversionExceptionHandler.java
@@ -0,0 +1,21 @@
+package io.onedev.server.exception.handler;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.wicket.util.convert.ConversionException;
+
+import io.onedev.server.exception.HttpResponse;
+
+public class ConversionExceptionHandler extends AbstractExceptionHandler<ConversionException> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public HttpResponse getResponse(ConversionException exception) {
+ if (exception.getMessage() != null)
+ return new HttpResponse(HttpServletResponse.SC_NOT_ACCEPTABLE, exception.getMessage());
+ else
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
index 389750c85b..af4e926487 100644
--- a/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
+++ b/server-core/src/main/java/io/onedev/server/job/DefaultJobService.java
@@ -799,7 +799,7 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
} catch (Throwable e) {
String message = String.format("Error submitting build (project: %s, commit: %s, job: %s)",
project.getPath(), commitId.name(), job.getName());
- logger.error(message, e);
+ logException(message, e);
}
}
@@ -810,7 +810,7 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
} catch (Throwable t) {
String message = String.format("Error checking job triggers (project: %s, commit: %s)",
event.getProject().getPath(), commitId.name());
- logger.error(message, t);
+ logException(message, t);
} finally {
JobAuthorizationContext.pop();
}
@@ -967,7 +967,7 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
if (shell != null)
shell.writeToStdin(data);
} catch (Throwable e) {
- logger.error("Error sending shell input", e);
+ logException("Error sending shell input", e);
}
return null;
});
@@ -981,7 +981,7 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
if (shell != null)
shell.resize(rows, cols);
} catch (Throwable e) {
- logger.error("Error resizing shell", e);
+ logException("Error resizing shell", e);
}
return null;
});
@@ -995,7 +995,7 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
if (shell != null)
shell.terminate();
} catch (Throwable e) {
- logger.error("Error exiting shell", e);
+ logException("Error exiting shell", e);
}
return null;
});
@@ -1082,16 +1082,22 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
branchSchedules.remove(key);
else
branchSchedules.put(key, schedules);
- } catch (BuildSpecParseException e) {
- logger.debug("Malformed build spec (project: {}, branch: {})", project.getPath(), branch);
- } catch (ValidationException e) {
- logger.debug(String.format("Error validating build spec (project: %s, branch: %s)", project.getPath(), branch), e);
} catch (Throwable e) {
- logger.error(String.format("Error caching branch schedules (project: %s, branch: %s)", project.getPath(), branch), e);
+ var message = String.format("Error caching branch schedules (project: %s, branch: %s)", project.getPath(), branch);
+ logException(message, e);
} finally {
JobAuthorizationContext.pop();
}
}
+
+ private void logException(String message, Throwable e) {
+ if (ExceptionUtils.find(e, BuildSpecParseException.class) != null
+ || ExceptionUtils.find(e, ValidationException.class) != null) {
+ logger.warn(message, e);
+ } else {
+ logger.error(message, e);
+ }
+ }
@Listen
public void on(SystemStarted event) {
@@ -1167,7 +1173,7 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
} catch (Exception e) {
String errorMessage = String.format("Error triggering scheduled job (project: %s, branch: %s)",
project.getPath(), GitUtils.ref2branch(match.getRefName()));
- logger.error(errorMessage, e);
+ logException(errorMessage, e);
}
}
}
@@ -1294,7 +1300,7 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
}
});
} catch (Throwable t) {
- logger.error("Error checking unfinished builds", t);
+ logException("Error checking unfinished builds", t);
}
return null;
}));
@@ -1343,7 +1349,7 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
checkImmediately = false;
} catch (Throwable t) {
if (ExceptionUtils.find(t, ServerNotFoundException.class) == null) {
- logger.error("Error checking builds", t);
+ logException("Error checking builds", t);
}
}
}
@@ -1371,7 +1377,7 @@ public class DefaultJobService implements JobService, Runnable, CodePullAuthoriz
} catch (Throwable e) {
String message = String.format("Error processing post build actions (project: %s, commit: %s, job: %s)",
build.getProject().getPath(), build.getCommitHash(), build.getJobName());
- logger.error(message, e);
+ logException(message, e);
} finally {
Build.pop();
JobAuthorizationContext.pop();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
index 5ce459e24b..6b11f28634 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusLink.java
@@ -5,8 +5,6 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
-import org.jspecify.annotations.Nullable;
-
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
@@ -18,12 +16,14 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.eclipse.jgit.lib.ObjectId;
+import org.jspecify.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Sets;
import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.BuildSpecParseException;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.job.JobAuthorizationContext;
import io.onedev.server.model.Build;
@@ -36,7 +36,7 @@ import io.onedev.server.web.component.job.joblist.JobListPanel;
import io.onedev.server.web.component.link.DropdownLink;
public abstract class CommitStatusLink extends DropdownLink {
-
+
private static final Logger logger = LoggerFactory.getLogger(CommitStatusLink.class);
private final ObjectId commitId;
@@ -53,9 +53,10 @@ public abstract class CommitStatusLink extends DropdownLink {
BuildSpec buildSpec = getProject().getBuildSpec(commitId);
if (buildSpec != null)
jobs.addAll(buildSpec.getJobMap().values());
- } catch (Exception e) {
- logger.error("Error retrieving build spec (project: {}, commit: {})",
- getProject().getPath(), commitId.name(), e);
+ } catch (BuildSpecParseException e) {
+ var message = String.format("Error parsing build spec (project: %s, commit: %s)",
+ getProject().getPath(), commitId.name());
+ logger.warn(message, e);
} finally {
JobAuthorizationContext.pop();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index 440b5aa4a4..31146ac4bc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -1,20 +1,67 @@
package io.onedev.server.web.page.project.commits;
+import static io.onedev.server.ai.ToolUtils.getDiffTools;
+import static io.onedev.server.ai.ToolUtils.wrapForChat;
+import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;
+import static io.onedev.server.web.translation.Translation._T;
+import static java.util.stream.Collectors.toList;
+
+import java.io.Serializable;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevObject;
+import org.jspecify.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.collect.Sets;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.OneDev;
import io.onedev.server.ai.ChatTool;
import io.onedev.server.ai.tools.code.CommitDetailTool;
import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.BuildSpecParseException;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CodeProblemContribution;
import io.onedev.server.codequality.CoverageStatus;
import io.onedev.server.codequality.LineCoverageContribution;
-import io.onedev.server.service.*;
import io.onedev.server.entityreference.LinkTransformer;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
@@ -22,11 +69,21 @@ import io.onedev.server.git.service.GitService;
import io.onedev.server.git.service.RefFacade;
import io.onedev.server.job.JobAuthorizationContext;
import io.onedev.server.job.JobAuthorizationContextAware;
-import io.onedev.server.model.*;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.CodeCommentReply;
+import io.onedev.server.model.CodeCommentStatusChange;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.Mark;
import io.onedev.server.model.support.code.BranchProtection;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.CodeCommentReplyService;
+import io.onedev.server.service.CodeCommentService;
+import io.onedev.server.service.CodeCommentStatusChangeService;
+import io.onedev.server.service.PullRequestService;
+import io.onedev.server.service.SettingService;
import io.onedev.server.util.diff.WhitespaceOption;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.component.AjaxLazyLoadPanel;
@@ -52,50 +109,11 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.overview.ProjectOverviewPage;
import io.onedev.server.web.util.editbean.CommitMessageBean;
import io.onedev.server.xodus.CommitInfoService;
-import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.Session;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.jspecify.annotations.Nullable;
-import java.io.Serializable;
-import java.text.MessageFormat;
-import java.util.*;
-
-import static io.onedev.server.ai.ToolUtils.getDiffTools;
-import static io.onedev.server.ai.ToolUtils.wrapForChat;
-import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;
-import static io.onedev.server.web.translation.Translation._T;
-import static java.util.stream.Collectors.toList;
public class CommitDetailPage extends ProjectPage implements RevisionAnnotationSupport, JobAuthorizationContextAware {
private static final Logger logger = LoggerFactory.getLogger(CommitDetailPage.class);
-
+
public static final String PARAM_COMMIT = "commit";
// make sure to use a different value from wicket:id according to wicket bug:
@@ -465,9 +483,10 @@ public class CommitDetailPage extends ProjectPage implements RevisionAnnotationS
if (buildSpec != null) {
jobs.addAll(buildSpec.getJobMap().values());
}
- } catch (Exception e) {
- logger.error("Error retrieving build spec (project: {}, commit: {})",
- getProject().getPath(), getCommit().name(), e);
+ } catch (BuildSpecParseException e) {
+ var message = String.format("Error parsing build spec (project: %s, commit: %s)",
+ getProject().getPath(), getCommit().name());
+ logger.warn(message, e);
}
return jobs;
}
diff --git a/server-product/system/conf/logback.xml b/server-product/system/conf/logback.xml
index b0ab97b05f..e1ce2a1910 100644
--- a/server-product/system/conf/logback.xml
+++ b/server-product/system/conf/logback.xml
@@ -27,8 +27,7 @@
</appender>
<logger name="org.glassfish.jersey.servlet.WebComponent" level="ERROR"/>
- <logger name="org.apache.wicket" level="WARN"/>
- <logger name="org.apache.wicket.page.XmlPartialPageUpdate" level="ERROR"/>
+ <logger name="org.apache.wicket" level="ERROR"/>
<logger name="org.eclipse" level="WARN"/>
<logger name="org.hibernate" level="WARN"/>
<logger name="java.sql.DatabaseMetaData" level="WARN"/>
@@ -46,7 +45,6 @@
<logger name="com.zaxxer.hikari.HikariDataSource" level="ERROR"/>
<logger name="com.zaxxer.hikari.util.DriverDataSource" level="ERROR"/>
<logger name="org.apache.shiro.mgt" level="ERROR"/>
- <logger name="org.apache.wicket.request.resource.ResourceReferenceRegistry" level="ERROR"/>
<logger name="org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator" level="ERROR"/>
<logger name="org.eclipse.jgit.util.FS" level="ERROR"/>
<logger name="com.hazelcast" level="ERROR"/>