The Unified and Autonomous Development Platform
Improve taskbutton to display task progress messages
Robin Shen93d5db3f0c29
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.javaindex fa1ff4ced3..d27ef3d06c 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java@@ -49,7 +49,6 @@ import io.onedev.server.ci.CISpec;import io.onedev.server.ci.InvalidCISpecException;import io.onedev.server.ci.JobDependency;import io.onedev.server.ci.job.log.JobLogManager;-import io.onedev.server.ci.job.log.JobLogger;import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.entitymanager.BuildManager;@@ -80,6 +79,7 @@ import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.security.CodePullAuthorizationSource;import io.onedev.server.util.Input;+import io.onedev.server.util.JobLogger;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.util.patternset.PatternSet;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/DependencyPopulator.java b/server-core/src/main/java/io/onedev/server/ci/job/DependencyPopulator.javaindex fa64973419..853f12a4cc 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/DependencyPopulator.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/DependencyPopulator.java@@ -2,8 +2,8 @@ package io.onedev.server.ci.job;import java.io.File;-import io.onedev.server.ci.job.log.JobLogger;import io.onedev.server.model.Build;+import io.onedev.server.util.JobLogger;public interface DependencyPopulator {diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobOutcome.java b/server-core/src/main/java/io/onedev/server/ci/job/JobOutcome.javaindex a3ebb2ae23..d5b40f08a3 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/JobOutcome.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobOutcome.java@@ -6,9 +6,9 @@ import java.io.Serializable;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;-import io.onedev.server.ci.job.log.JobLogger;import io.onedev.server.model.Build;import io.onedev.server.storage.StorageManager;+import io.onedev.server.util.JobLogger;import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Patterns;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultJobLogManager.java b/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultJobLogManager.javaindex 06510a9630..2e529aba69 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultJobLogManager.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultJobLogManager.java@@ -34,7 +34,6 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Charsets;import com.google.common.base.Splitter;-import com.google.common.base.Throwables;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.utils.ExceptionUtils;@@ -48,6 +47,7 @@ import io.onedev.server.event.build.BuildFinished;import io.onedev.server.model.Build;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.storage.StorageManager;+import io.onedev.server.util.JobLogger;import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.web.websocket.WebSocketManager;@@ -134,13 +134,8 @@ public class DefaultJobLogManager implements JobLogManager {}@Override- public void log(String message, Throwable throwable) {+ public void log(String message) {try {- if (throwable != null) {- for (String line: Splitter.on(EOL_PATTERN).split(Throwables.getStackTraceAsString(throwable)))- message += "\n " + line;- }-if (message.startsWith(LogInstruction.PREFIX)) {doLog(message);diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/JobLogManager.java b/server-core/src/main/java/io/onedev/server/ci/job/log/JobLogManager.javaindex 53e858cb3c..a632d5d67a 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/log/JobLogManager.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/log/JobLogManager.java@@ -5,6 +5,7 @@ import java.util.Collection;import java.util.List;import io.onedev.server.model.Build;+import io.onedev.server.util.JobLogger;public interface JobLogManager {diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/JobLogger.java b/server-core/src/main/java/io/onedev/server/ci/job/log/JobLogger.javadeleted file mode 100644index adb2412080..0000000000--- a/server-core/src/main/java/io/onedev/server/ci/job/log/JobLogger.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.ci.job.log;--import javax.annotation.Nullable;--public abstract class JobLogger {-- public abstract void log(String message, @Nullable Throwable t);-- public void log(String message) {- log(message, null);- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/JobContext.java b/server-core/src/main/java/io/onedev/server/model/support/JobContext.javaindex 32a5e351d1..944607e4dc 100644--- a/server-core/src/main/java/io/onedev/server/model/support/JobContext.java+++ b/server-core/src/main/java/io/onedev/server/model/support/JobContext.java@@ -12,9 +12,9 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.server.ci.job.cache.JobCache;-import io.onedev.server.ci.job.log.JobLogger;import io.onedev.server.git.command.CheckoutCommand;import io.onedev.server.git.command.FetchCommand;+import io.onedev.server.util.JobLogger;import io.onedev.server.util.patternset.PatternSet;public abstract class JobContext {diff --git a/server-core/src/main/java/io/onedev/server/util/JobLogger.java b/server-core/src/main/java/io/onedev/server/util/JobLogger.javanew file mode 100644index 0000000000..e075aa1cbf--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/JobLogger.java@@ -0,0 +1,24 @@+package io.onedev.server.util;++import java.util.regex.Pattern;++import javax.annotation.Nullable;++import com.google.common.base.Splitter;+import com.google.common.base.Throwables;++public abstract class JobLogger {++ private static final Pattern EOL_PATTERN = Pattern.compile("\r?\n");++ public void log(String message, @Nullable Throwable t) {+ if (t != null) {+ for (String line: Splitter.on(EOL_PATTERN).split(Throwables.getStackTraceAsString(t)))+ message += "\n " + line;+ }+ log(message);+ }++ public abstract void log(String message);++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.javaindex 1beb4083c8..f2499a171a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java@@ -1,7 +1,9 @@package io.onedev.server.web.component.taskbutton;+import java.util.ArrayList;import java.util.Date;import java.util.Iterator;+import java.util.List;import java.util.Map;import java.util.concurrent.Callable;import java.util.concurrent.ConcurrentHashMap;@@ -18,8 +20,6 @@ import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.form.Form;import org.joda.time.DateTime;import org.quartz.ScheduleBuilder;@@ -27,7 +27,6 @@ import org.quartz.SimpleScheduleBuilder;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.unbescape.html.HtmlEscape;-import org.unbescape.javascript.JavaScriptEscape;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.utils.ExceptionUtils;@@ -37,7 +36,9 @@ import io.onedev.commons.utils.schedule.TaskScheduler;import io.onedev.server.OneDev;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;+import io.onedev.server.util.JobLogger;import io.onedev.server.web.component.modal.ModalPanel;+import jersey.repackaged.com.google.common.collect.Lists;@SuppressWarnings("serial")public abstract class TaskButton extends AjaxButton {@@ -64,78 +65,91 @@ public abstract class TaskButton extends AjaxButton {}protected void submitTask(AjaxRequestTarget target) {- target.appendJavaScript(String.format("$('#%s').closest('form').children('.task-feedback').remove();", getMarkupId()));String path = getPath();+ String title = WordUtils.uncamel(getId()).toLowerCase();ExecutorService executorService = OneDev.getInstance(ExecutorService.class);+ List<String> messages = Lists.newArrayList("Please wait...");TaskFuture future = getTaskFutures().put(path, new TaskFuture(executorService.submit(new Callable<String>() {@Overridepublic String call() throws Exception {- return runTask();+ String result;+ try {+ result = String.format(+ "<div class='task-result alert alert-success'>%s</div>",+ HtmlEscape.escapeHtml5(runTask(new JobLogger() {++ @Override+ public void log(String message) {+ synchronized (messages) {+ messages.add(message);+ }+ }++ })));+ } catch (Exception e) {+ logger.debug("Error " + title, e);+ String suggestedSolution = ExceptionUtils.suggestSolution(e);+ if (suggestedSolution != null)+ logger.warn("!!! " + suggestedSolution);+ if (e.getMessage() != null)+ result = e.getMessage();+ else+ result = "Error " + title;+ result = String.format(+ "<div class='task-result alert alert-danger'>%s</div>",+ HtmlEscape.escapeHtml5(result));+ }+ result = StringUtils.replace(result, "\n", "<br>");+ return result;}- })));+ }), messages));+if (future != null && !future.isDone())future.cancel(true);new ModalPanel(target) {+ @Override+ protected void onClosed() {+ super.onClosed();+ Future<?> future = getTaskFutures().remove(path);+ if (future != null && !future.isDone())+ future.cancel(true);+ }+@Overrideprotected Component newContent(String id) {- String message = WordUtils.uncamel(TaskButton.this.getId()).toLowerCase();- return new TaskWaitPanel(id, StringUtils.capitalize(message) + " in progress...") {+ return new TaskFeedbackPanel(id, StringUtils.capitalize(title)) {@Override- protected void check(AjaxRequestTarget target) {- Future<String> future = getTaskFutures().get(path);- if (future != null) {- if (future.isDone()) {- if (!future.isCancelled()) {- String feedback;- try {- feedback = String.format(- "<div class='task-feedback alert alert-success'>%s</div>",- HtmlEscape.escapeHtml5(future.get()));- } catch (ExecutionException e) {- logger.debug("Error " + message, e);- String suggestedSolution = ExceptionUtils.suggestSolution(e);- if (suggestedSolution != null)- logger.warn("!!! " + suggestedSolution);- feedback = "Error " + message;- String exceptionMessage;- if (e.getCause() != null)- exceptionMessage = e.getCause().getMessage();- else- exceptionMessage = e.getMessage();- if (exceptionMessage != null)- feedback += ": " + exceptionMessage;- feedback += ", check server log for details.";- feedback = String.format(- "<div class='task-feedback alert alert-danger'>%s</div>",- HtmlEscape.escapeHtml5(feedback));- } catch (InterruptedException e) {- throw new RuntimeException(e);- }- feedback = StringUtils.replace(feedback, "\n", "<br>");- target.appendJavaScript(String.format(""- + "var $form = $('#%s').closest('form');"- + "$form.append('%s');"- + "$form.children('.task-feedback')[0].scrollIntoView({behavior: 'smooth', block: 'center'})",- TaskButton.this.getMarkupId(), JavaScriptEscape.escapeJavaScript(feedback)));- }- close();- }- } else {- close();- }+ protected void onClose(AjaxRequestTarget target) {+ close();}@Override- protected void onCancel(AjaxRequestTarget target) {- Future<?> future = getTaskFutures().remove(path);- if (future != null && !future.isDone())- future.cancel(true);+ protected List<String> getMessages() {+ TaskFuture future = getTaskFutures().get(path);+ if (future != null)+ return future.getMessages();+ else+ return new ArrayList<>();+ }++ @Override+ protected String getResult() {+ TaskFuture future = getTaskFutures().get(path);+ if (future != null && future.isDone() && !future.isCancelled()) {+ try {+ return future.get();+ } catch (InterruptedException | ExecutionException e) {+ throw new RuntimeException(e);+ }+ } else {+ return null;+ }}};@@ -144,12 +158,6 @@ public abstract class TaskButton extends AjaxButton {};}- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new TaskButtonCssResourceReference()));- }-@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);@@ -158,7 +166,7 @@ public abstract class TaskButton extends AjaxButton {submitTask(target);}- protected abstract String runTask();+ protected abstract String runTask(JobLogger logger);@Singletonpublic static class TaskFutureManager implements SchedulableTask {@@ -209,8 +217,11 @@ public abstract class TaskButton extends AjaxButton {private final Future<String> wrapped;- public TaskFuture(Future<String> wrapped) {+ private final List<String> messages;++ public TaskFuture(Future<String> wrapped, List<String> messages) {this.wrapped = wrapped;+ this.messages = messages;}@Override@@ -243,5 +254,11 @@ public abstract class TaskButton extends AjaxButton {return get(timeout, unit);}+ public List<String> getMessages() {+ synchronized (messages) {+ return new ArrayList<>(messages);+ }+ }+}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButtonCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButtonCssResourceReference.javadeleted file mode 100644index 336a529061..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButtonCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.component.taskbutton;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class TaskButtonCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public TaskButtonCssResourceReference() {- super(TaskButtonCssResourceReference.class, "task-button.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackCssResourceReference.javanew file mode 100644index 0000000000..5e33510c3c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.taskbutton;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class TaskFeedbackCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public TaskFeedbackCssResourceReference() {+ super(TaskFeedbackCssResourceReference.class, "task-feedback.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.html b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.htmlnew file mode 100644index 0000000000..a802700989--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.html@@ -0,0 +1,15 @@+<wicket:panel>+ <div class="task-feedback">+ <div class="modal-header">+ <button wicket:id="closeIcon" type="button" class="close">×</button>+ <h4 wicket:id="title" class="modal-title"></h4>+ </div>+ <div class="modal-body">+ <pre wicket:id="messages" class="messages"></pre>+ <div wicket:id="result" class="result"></div>+ </div>+ <div class="modal-footer">+ <button wicket:id="closeButton" class="btn btn-default"><span wicket:id="label"></span></button>+ </div>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.javanew file mode 100644index 0000000000..f44f9e3895--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskFeedbackPanel.java@@ -0,0 +1,148 @@+package io.onedev.server.web.component.taskbutton;++import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.util.time.Duration;+import org.unbescape.html.HtmlEscape;++@SuppressWarnings("serial")+abstract class TaskFeedbackPanel extends Panel {++ private final String title;++ private String prevMessages;++ public TaskFeedbackPanel(String id, String title) {+ super(id);+ this.title = title;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("title", title));++ add(new AjaxLink<Void>("closeIcon") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onClose(target);+ }++ });++ Component closeLabel = new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (getResult() != null)+ return "Ok";+ else+ return "Cancel";+ }++ }).setOutputMarkupId(true);++ add(new AjaxLink<Void>("closeButton") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onClose(target);+ }++ }.add(closeLabel));++ Component messagesLabel = new Label("messages", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ List<String> messages = getMessages();+ StringBuilder builder = new StringBuilder();+ for (String message: messages)+ builder.append(HtmlEscape.escapeHtml5(message)).append("<br>");+ return builder.toString();+ }++ }) {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ String script = String.format("$('#%s').scrollTop($('#%s')[0].scrollHeight);",+ getMarkupId(), getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ @Override+ protected void onBeforeRender() {+ prevMessages = getDefaultModelObjectAsString();+ super.onBeforeRender();+ }++ }.setEscapeModelStrings(false).setOutputMarkupId(true);++ add(messagesLabel);++ Component resultLabel = new Label("result", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return getResult();+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getResult() != null);+ }++ }.setEscapeModelStrings(false).setOutputMarkupPlaceholderTag(true);++ add(resultLabel);++ add(new AbstractAjaxTimerBehavior(Duration.ONE_SECOND) {++ @Override+ protected void onTimer(AjaxRequestTarget target) {+ if (getResult() != null) {+ target.add(closeLabel);+ target.add(resultLabel);+ stop(target);+ }+ if (!messagesLabel.getDefaultModelObjectAsString().equals(prevMessages))+ target.add(messagesLabel);+ }++ });+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new TaskFeedbackCssResourceReference()));+ }++ protected abstract void onClose(AjaxRequestTarget target);++ protected abstract List<String> getMessages();++ @Nullable+ protected abstract String getResult();++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskWaitPanel.html b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskWaitPanel.htmldeleted file mode 100644index c584991752..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskWaitPanel.html+++ /dev/null@@ -1,10 +0,0 @@-<wicket:panel>- <div class="task-wait">- <div class="modal-body">- <div wicket:id="message"></div>- </div>- <div class="modal-footer">- <button wicket:id="cancel" class="btn btn-default">Cancel</button>- </div>- </div>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskWaitPanel.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskWaitPanel.javadeleted file mode 100644index 1e825108b3..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskWaitPanel.java+++ /dev/null@@ -1,48 +0,0 @@-package io.onedev.server.web.component.taskbutton;--import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.util.time.Duration;--@SuppressWarnings("serial")-abstract class TaskWaitPanel extends Panel {-- private final String message;-- public TaskWaitPanel(String id, String message) {- super(id);- this.message = message;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Label("message", message));- add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });-- add(new AbstractAjaxTimerBehavior(Duration.ONE_SECOND) {-- @Override- protected void onTimer(AjaxRequestTarget target) {- check(target);- }-- });- }-- protected abstract void check(AjaxRequestTarget target);-- protected abstract void onCancel(AjaxRequestTarget target);--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-button.css b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-button.cssdeleted file mode 100644index a213b839b4..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-button.css+++ /dev/null@@ -1,13 +0,0 @@-.task-wait .modal-body {- padding: 20px;- font-size: 18px;- font-weight: bold;- text-align: center;-}-.task-wait .modal-footer {- text-align: center;-}-form>.task-feedback {- margin-top: 20px;- margin-bottom: 0;-}diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-feedback.css b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-feedback.cssnew file mode 100644index 0000000000..98c592d1db--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/task-feedback.css@@ -0,0 +1,13 @@+.task-feedback .modal-footer {+ text-align: center;+}+.task-feedback .messages {+ background: white;+ border: none;+ padding: 0;+ max-height: 480px;+}+.task-feedback .alert {+ margin-top: 12px;+ margin-bottom: 0;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.javaindex e1547de5b8..924b8b968c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java@@ -22,6 +22,7 @@ import com.google.common.base.Joiner;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.authenticator.Authenticated;+import io.onedev.server.util.JobLogger;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.taskbutton.TaskButton;import io.onedev.server.web.editable.BeanContext;@@ -133,7 +134,7 @@ public class AuthenticatorPage extends AdministrationPage {}@Override- protected String runTask() {+ protected String runTask(JobLogger logger) {try {Authenticated authenticated = bean.getAuthenticator().authenticate(new UsernamePasswordToken(token.getUserName(), token.getPassword()));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.javaindex 5476c81985..c90df06fab 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java@@ -18,6 +18,7 @@ import org.apache.wicket.util.visit.IVisitor;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.model.support.JobExecutor;+import io.onedev.server.util.JobLogger;import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.component.taskbutton.TaskButton;import io.onedev.server.web.editable.BeanContext;@@ -174,8 +175,8 @@ abstract class JobExecutorEditPanel extends Panel {@SuppressWarnings({ "unchecked", "rawtypes" })@Override- protected String runTask() {- ((Testable)bean.getExecutor()).test(testData);+ protected String runTask(JobLogger logger) {+ ((Testable)bean.getExecutor()).test(testData, logger);return "Job executor tested successfully";}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.javaindex 78dcb1fb47..eb11a870e1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java@@ -14,6 +14,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.notification.MailManager;+import io.onedev.server.util.JobLogger;import io.onedev.server.web.component.taskbutton.TaskButton;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;@@ -64,7 +65,7 @@ public class MailSettingPage extends AdministrationPage {}@Override- protected String runTask() {+ protected String runTask(JobLogger logger) {User currentUser = OneDev.getInstance(UserManager.class).getCurrent();OneDev.getInstance(MailManager.class).sendMail(mailSettingHolder.getMailSetting(),Sets.newHashSet(currentUser.getEmail()),diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/ForgetPage.javaindex ebd0f225c8..b54ed99844 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java@@ -17,6 +17,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.notification.MailManager;+import io.onedev.server.util.JobLogger;import io.onedev.server.web.component.taskbutton.TaskButton;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.annotation.Editable;@@ -41,7 +42,7 @@ public class ForgetPage extends BasePage {form.add(new TaskButton("resettingPassword") {@Override- protected String runTask() {+ protected String runTask(JobLogger logger) {UserManager userManager = OneDev.getInstance(UserManager.class);User user = userManager.findByName(bean.getUserNameOrEmailAddress());if (user == null) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.htmlindex 795b443f3a..f9918672c1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html@@ -1,3 +1,5 @@<wicket:extend>- <a wicket:id="test">test</a>+ <form wicket:id="form">+ <a wicket:id="test">test</a>+ </form></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex 4907f3ba53..f8df2aa736 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -3,9 +3,11 @@ package io.onedev.server.web.page.test;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.link.Link;+import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.util.JobLogger;+import io.onedev.server.web.component.taskbutton.TaskButton;import io.onedev.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -19,13 +21,16 @@ public class TestPage extends BasePage {protected void onInitialize() {super.onInitialize();- add(new Link<Void>("test") {+ Form<?> form = new Form<Void>("form");+ form.add(new TaskButton("test") {@Override- public void onClick() {+ protected String runTask(JobLogger logger) {+ return "successful";}-+});+ add(form);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/util/Testable.java b/server-core/src/main/java/io/onedev/server/web/util/Testable.javaindex 4e40f83491..7f809af429 100644--- a/server-core/src/main/java/io/onedev/server/web/util/Testable.java+++ b/server-core/src/main/java/io/onedev/server/web/util/Testable.java@@ -2,8 +2,10 @@ package io.onedev.server.web.util;import java.io.Serializable;+import io.onedev.server.util.JobLogger;+public interface Testable<T extends Serializable> {- void test(T data);+ void test(T data, JobLogger logger);}diff --git a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactsPopulator.java b/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactsPopulator.javaindex 32a8e2ca75..558faa24c9 100644--- a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactsPopulator.java+++ b/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/ArtifactsPopulator.java@@ -8,8 +8,8 @@ import org.apache.commons.io.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.server.ci.job.DependencyPopulator;import io.onedev.server.ci.job.JobOutcome;-import io.onedev.server.ci.job.log.JobLogger;import io.onedev.server.model.Build;+import io.onedev.server.util.JobLogger;public class ArtifactsPopulator implements DependencyPopulator {diff --git a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/JobArtifacts.java b/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/JobArtifacts.javaindex ccc5ab0706..6e6cce1527 100644--- a/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/JobArtifacts.java+++ b/server-plugin/server-plugin-artifact/src/main/java/io/onedev/server/plugin/artifact/JobArtifacts.java@@ -7,8 +7,8 @@ import java.util.concurrent.Callable;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.server.ci.job.JobOutcome;-import io.onedev.server.ci.job.log.JobLogger;import io.onedev.server.model.Build;+import io.onedev.server.util.JobLogger;import io.onedev.server.web.editable.annotation.Editable;@Editable(name="Artifacts")diff --git a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/JobHtmlReport.java b/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/JobHtmlReport.javaindex f433baf889..b0541daf94 100644--- a/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/JobHtmlReport.java+++ b/server-plugin/server-plugin-htmlreport/src/main/java/io/onedev/server/plugin/htmlreport/JobHtmlReport.java@@ -12,8 +12,8 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.server.ci.job.JobOutcome;-import io.onedev.server.ci.job.log.JobLogger;import io.onedev.server.model.Build;+import io.onedev.server.util.JobLogger;import io.onedev.server.web.editable.annotation.Editable;@Editable(name="Html Report")diff --git a/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesExecutor.javaindex a7deb2c18d..822d3fec06 100644--- a/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-kubernetes/src/main/java/io/onedev/server/plugin/kubernetes/KubernetesExecutor.java@@ -35,11 +35,11 @@ import io.onedev.commons.utils.command.LineConsumer;import io.onedev.k8shelper.KubernetesHelper;import io.onedev.server.OneDev;import io.onedev.server.OneException;-import io.onedev.server.ci.job.log.JobLogger;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.JobContext;import io.onedev.server.model.support.JobExecutor;import io.onedev.server.plugin.kubernetes.KubernetesExecutor.TestData;+import io.onedev.server.util.JobLogger;import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -139,6 +139,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData@Editable(order=24000, group="More Settings", description="Specify cpu requirement of jobs using this executor. "+ "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu'>"+ "kubernetes documentation</a> for details")+ @NotEmptypublic String getCpuRequest() {return cpuRequest;}@@ -150,6 +151,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData@Editable(order=25000, group="More Settings", description="Specify memory requirement of jobs using this executor. "+ "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory'>"+ "kubernetes documentation</a> for details")+ @NotEmptypublic String getMemoryRequest() {return memoryRequest;}@@ -164,15 +166,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}@Override- public void test(TestData testData) {- execute(testData.getDockerImage(), KubernetesResource.TEST_JOB_TOKEN, new JobLogger() {-- @Override- public void log(String message, Throwable t) {- logger.info(message, t);- }-- }, null);+ public void test(TestData testData, JobLogger logger) {+ execute(testData.getDockerImage(), KubernetesResource.TEST_JOB_TOKEN, logger, null);}@Override@@ -477,8 +472,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestDataif (jobContext != null)jobContext.notifyJobRunning();- KubernetesExecutor.logger.debug("Waiting for init container to stop (pod: {})...", podName);- waitForContainerStop(podName, "init", logger);+ KubernetesExecutor.logger.debug("Collecting init container log (pod: {})...", podName);+ collectContainerLog(podName, "init", logger);KubernetesExecutor.logger.debug("Waiting for main container to start (pod: {})...", podName);watchPod(podName, new StatusChecker() {@@ -499,8 +494,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}, logger);- KubernetesExecutor.logger.debug("Waiting for main container to stop (pod: {})...", podName);- waitForContainerStop(podName, "main", logger);+ KubernetesExecutor.logger.debug("Collecting main container log (pod: {})...", podName);+ collectContainerLog(podName, "main", logger);KubernetesExecutor.logger.debug("Waiting for sidecar container to start (pod: {})...", podName);watchPod(podName, new StatusChecker() {@@ -520,10 +515,10 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}, logger);- KubernetesExecutor.logger.debug("Waiting for sidecar container to stop (pod: {})...", podName);- waitForContainerStop(podName, "sidecar", logger);+ KubernetesExecutor.logger.debug("Collecting sidecar container log (pod: {})...", podName);+ collectContainerLog(podName, "sidecar", logger);- KubernetesExecutor.logger.debug("Checking sidecar container (pod: {})...", podName);+ KubernetesExecutor.logger.debug("Checking sidecar container result (pod: {})...", podName);watchPod(podName, new StatusChecker() {@Override@@ -728,7 +723,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData}}- private void waitForContainerStop(String podName, String containerName, JobLogger logger) {+ private void collectContainerLog(String podName, String containerName, JobLogger logger) {Commandline kubectl = newKubeCtl();kubectl.addArgs("logs", podName, "-c", containerName, "-n", getNamespace(), "--follow");kubectl.execute(new LineConsumer() {diff --git a/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.javaindex 464652504d..38129dfc42 100644--- a/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-serverdocker/src/main/java/io/onedev/server/plugin/serverdocker/ServerDockerExecutor.java@@ -37,10 +37,10 @@ import io.onedev.server.ci.job.cache.CacheAllocation;import io.onedev.server.ci.job.cache.CacheCallable;import io.onedev.server.ci.job.cache.CacheRunner;import io.onedev.server.ci.job.cache.JobCache;-import io.onedev.server.ci.job.log.JobLogger;import io.onedev.server.model.support.JobContext;import io.onedev.server.model.support.JobExecutor;import io.onedev.server.plugin.serverdocker.ServerDockerExecutor.TestData;+import io.onedev.server.util.JobLogger;import io.onedev.server.util.OneContext;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;@@ -128,21 +128,21 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDaCommandline docker = getDocker();docker.addArgs("inspect", image);- StringBuilder output = new StringBuilder();+ StringBuilder builder = new StringBuilder();docker.execute(new LineConsumer(Charsets.UTF_8.name()) {@Overridepublic void consume(String line) {- logger.log(line);- output.append(line).append("\n");+ ServerDockerExecutor.logger.debug(line);+ builder.append(line).append("\n");}- }, newCommandLogger(logger)).checkReturnCode();+ }, newJobLogger(logger)).checkReturnCode();Map<String, Object> map;try {map = (Map<String, Object>) new ObjectMapper()- .readValue(output.toString(), List.class).iterator().next();+ .readValue(builder.toString(), List.class).iterator().next();return (String) map.get("Os");} catch (IOException e) {throw new RuntimeException(e);@@ -178,7 +178,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDalogger.log("Pulling image...") ;Commandline docker = getDocker();docker.addArgs("pull", jobContext.getEnvironment());- docker.execute(newCommandLogger(logger), newCommandLogger(logger)).checkReturnCode();+ docker.execute(newDebugLogger(), newJobLogger(logger)).checkReturnCode();docker.clearArgs();String jobInstance = UUID.randomUUID().toString();@@ -252,14 +252,14 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDalogger.log("Running container to execute job...");try {- docker.execute(newCommandLogger(logger), newCommandLogger(logger), null, new ProcessKiller() {+ docker.execute(newDebugLogger(), newJobLogger(logger), null, new ProcessKiller() {@Overridepublic void kill(Process process) {logger.log("Stopping container...");Commandline cmd = getDocker();cmd.addArgs("stop", jobInstance);- cmd.execute(newCommandLogger(logger), newCommandLogger(logger)).checkReturnCode();+ cmd.execute(newDebugLogger(), newJobLogger(logger)).checkReturnCode();}}).checkReturnCode();@@ -285,7 +285,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa});}- private LineConsumer newCommandLogger(JobLogger logger) {+ private LineConsumer newJobLogger(JobLogger logger) {return new LineConsumer(Charsets.UTF_8.name()) {@Override@@ -296,6 +296,17 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa};}+ private LineConsumer newDebugLogger() {+ return new LineConsumer(Charsets.UTF_8.name()) {++ @Override+ public void consume(String line) {+ logger.debug(line);+ }++ };+ }+private void login(JobLogger logger) {for (RegistryLogin login: getRegistryLogins()) {if (login.getRegistryUrl() != null)@@ -312,7 +323,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa} catch (UnsupportedEncodingException e) {throw new RuntimeException(e);}- cmd.execute(newCommandLogger(logger), newCommandLogger(logger), input).checkReturnCode();+ cmd.execute(newDebugLogger(), newJobLogger(logger), input).checkReturnCode();}}@@ -398,24 +409,14 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa}@Override- public void test(TestData testData) {- JobLogger logger = new JobLogger() {-- @Override- public void log(String message, Throwable t) {- ServerDockerExecutor.logger.info(message, t);- }-- };- logger.log("Testing local docker executor...");-+ public void test(TestData testData, JobLogger logger) {login(logger);logger.log("Pulling image...");Commandline cmd = getDocker();cmd.addArgs("pull", testData.getDockerImage());- cmd.execute(newCommandLogger(logger), newCommandLogger(logger)).checkReturnCode();+ cmd.execute(newDebugLogger(), newJobLogger(logger)).checkReturnCode();boolean windows = getImageOS(logger, testData.getDockerImage()).equals("windows");@@ -453,7 +454,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDaelsecmd.addArgs("sh", "-c", "echo hello from container");- cmd.execute(newCommandLogger(logger), newCommandLogger(logger)).checkReturnCode();+ cmd.execute(newJobLogger(logger), newJobLogger(logger)).checkReturnCode();} finally {if (workspaceDir != null)FileUtils.deleteDir(workspaceDir);@@ -467,7 +468,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDalogger.log("Checking busybox...");cmd = getDocker();cmd.addArgs("run", "--rm", "busybox", "sh", "-c", "echo hello from busybox");- cmd.execute(newCommandLogger(logger), newCommandLogger(logger)).checkReturnCode();+ cmd.execute(newJobLogger(logger), newJobLogger(logger)).checkReturnCode();}}