The Unified and Autonomous Development Platform
Add log manager
Robin Shen3afbe2cd7d46
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 342ce96ff5..573da046e4 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -82,9 +82,11 @@ import io.onedev.server.cache.DefaultCommitInfoManager;import io.onedev.server.cache.DefaultUserInfoManager;import io.onedev.server.cache.UserInfoManager;import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.DefaultJobScheduler;-import io.onedev.server.ci.JobScheduler;import io.onedev.server.ci.detect.CISpecDetector;+import io.onedev.server.ci.job.DefaultJobScheduler;+import io.onedev.server.ci.job.JobScheduler;+import io.onedev.server.ci.job.log.DefaultLogManager;+import io.onedev.server.ci.job.log.LogManager;import io.onedev.server.command.ApplyDBConstraintsCommand;import io.onedev.server.command.BackupDBCommand;import io.onedev.server.command.CheckDataVersionCommand;@@ -326,6 +328,7 @@ public class CoreModule extends AbstractPluginModule {bind(Build2Manager.class).to(DefaultBuild2Manager.class);bind(BuildDependenceManager.class).to(DefaultBuildDependenceManager.class);bind(JobScheduler.class).to(DefaultJobScheduler.class);+ bind(LogManager.class).to(DefaultLogManager.class);bind(PullRequestBuildManager.class).to(DefaultPullRequestBuildManager.class);bind(ConfigurationManager.class).to(DefaultConfigurationManager.class);bind(MailManager.class).to(DefaultMailManager.class);diff --git a/core/src/main/java/io/onedev/server/ci/CISpec.java b/core/src/main/java/io/onedev/server/ci/CISpec.javaindex 7f80046e52..08e7fe6f3a 100644--- a/core/src/main/java/io/onedev/server/ci/CISpec.java+++ b/core/src/main/java/io/onedev/server/ci/CISpec.java@@ -15,6 +15,8 @@ import com.google.common.base.Charsets;import com.google.common.collect.Lists;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.ci.job.Job;+import io.onedev.server.exception.OneException;import io.onedev.server.migration.VersionedDocument;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;@@ -119,7 +121,11 @@ public class CISpec implements Serializable, Validatable {public static CISpec parse(byte[] bytes) {String ciSpecString = new String(bytes, Charsets.UTF_8);if (StringUtils.isNotBlank(ciSpecString)) {- return (CISpec) VersionedDocument.fromXML(ciSpecString).toBean();+ try {+ return (CISpec) VersionedDocument.fromXML(ciSpecString).toBean();+ } catch (Exception e) {+ throw new OneException("Invalid CI spec", e);+ }} else {return null;}diff --git a/core/src/main/java/io/onedev/server/ci/Dependency.java b/core/src/main/java/io/onedev/server/ci/Dependency.javaindex b578767a5b..1cb931a22c 100644--- a/core/src/main/java/io/onedev/server/ci/Dependency.java+++ b/core/src/main/java/io/onedev/server/ci/Dependency.java@@ -6,7 +6,8 @@ import java.util.List;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.ci.jobparam.JobParam;+import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.util.OneContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;diff --git a/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.javasimilarity index 81%rename from core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.javarename to core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.javaindex d0cd724014..752e803237 100644--- a/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java+++ b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java@@ -1,4 +1,4 @@-package io.onedev.server.ci;+package io.onedev.server.ci.job;import java.util.ArrayList;import java.util.Date;@@ -19,8 +19,13 @@ import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.LockUtils;-import io.onedev.server.ci.jobparam.JobParam;-import io.onedev.server.ci.jobtrigger.JobTrigger;+import io.onedev.server.ci.CISpec;+import io.onedev.server.ci.Dependency;+import io.onedev.server.ci.job.log.JobLogger;+import io.onedev.server.ci.job.log.LogLevel;+import io.onedev.server.ci.job.log.LogManager;+import io.onedev.server.ci.job.param.JobParam;+import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.entitymanager.Build2Manager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;@@ -64,6 +69,8 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {private final TransactionManager transactionManager;+ private final LogManager logManager;+private final ExecutorService executorService;private final SettingManager settingManager;@@ -73,7 +80,8 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {@Injectpublic DefaultJobScheduler(ProjectManager projectManager, Build2Manager buildManager,UserManager userManager, ListenerRegistry listenerRegistry, SettingManager settingManager,- TransactionManager transactionManager, ExecutorService executorService) {+ TransactionManager transactionManager, ExecutorService executorService,+ LogManager logManager) {this.projectManager = projectManager;this.settingManager = settingManager;this.buildManager = buildManager;@@ -81,19 +89,20 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {this.listenerRegistry = listenerRegistry;this.transactionManager = transactionManager;this.executorService = executorService;+ this.logManager = logManager;}@Sessional@Overridepublic void submit(Project project, String commitHash, String jobName, Map<String, List<String>> paramMatrix) {- String commitLock = "job-schedule: " + project.getId() + "-" + commitHash;+ String lockKey = "job-schedule: " + project.getId() + "-" + commitHash;Long projectId = project.getId();Long userId = User.idOf(userManager.getCurrent());executorService.execute(new Runnable() {@Overridepublic void run() {- LockUtils.call(commitLock, new Callable<Void>() {+ LockUtils.call(lockKey, new Callable<Void>() {@Overridepublic Void call() {@@ -211,9 +220,52 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {if (job != null) {JobExecutor executor = settingManager.getJobExecutor(build.getProject(), commitId, job.getName(), job.getEnvironment());if (executor != null) {- String runningInstance = executor.run(job.getEnvironment(), job.getCommands());- if (runningInstance != null) {+ Long projectId = build.getProject().getId();+ Long buildId = build.getId();+ LogLevel loggerLevel = job.getLogLevel();++ String jobInstance = executor.run(job.getEnvironment(), job.getCommands(), new JobCallback() {++ @Override+ public void jobFinished(JobResult result, String resultMessage) {+ transactionManager.call(new Callable<Void>() {++ @Override+ public Void call() throws Exception {+ Build2 build = buildManager.load(buildId);+ switch (result) {+ case SUCCESSFUL:+ build.setStatus(Build2.Status.SUCCESSFUL, resultMessage);+ break;+ case FAILED:+ build.setStatus(Build2.Status.FAILED, resultMessage);+ break;+ case CANCELLED:+ build.setStatus(Build2.Status.CANCELLED, resultMessage);+ break;+ case IN_ERROR:+ build.setStatus(Build2.Status.IN_ERROR, resultMessage);+ break;+ default:+ throw new OneException("Unexpected job result: " + result);+ }+ buildManager.save(build);+ listenerRegistry.post(new BuildFinished(build));+ return null;+ }++ });+ }++ @Override+ public JobLogger getJobLogger() {+ return logManager.getLogger(projectId, buildId, loggerLevel);+ }++ });+ if (jobInstance != null) {build.setStatus(Build2.Status.RUNNING);+ build.setJobInstance(jobInstance);build.setRunningDate(new Date());buildManager.save(build);listenerRegistry.post(new BuildRunning(build));@@ -233,8 +285,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {}private void markBuildError(Build2 build, String errorMessage) {- build.setErrorMessage(errorMessage);- build.setStatus(Build2.Status.IN_ERROR);+ build.setStatus(Build2.Status.IN_ERROR, errorMessage);build.setFinishDate(new Date());buildManager.save(build);listenerRegistry.post(new BuildFinished(build));@@ -270,10 +321,9 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {if (build.isFinished()) {build.setStatus(Build2.Status.WAITING);- build.setErrorMessage(null);build.setFinishDate(null);build.setPendingDate(null);- build.setRunningInstance(null);+ build.setJobInstance(null);build.setRunningDate(null);build.setSubmitDate(new Date());build.setUser(userManager.getCurrent());@@ -288,14 +338,13 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {@Overridepublic void cancel(Build2 build) {if (build.getStatus() == Build2.Status.RUNNING) {- JobExecutor executor = settingManager.getJobExecutor(build.getRunningInstance());+ JobExecutor executor = settingManager.getJobExecutor(build.getJobInstance());if (executor != null)- executor.stop(build.getRunningInstance());+ executor.stop(build.getJobInstance());elsemarkBuildError(build, "Aborted for unknown reason");} else if (!build.isFinished()) {build.setStatus(Build2.Status.CANCELLED);- build.setErrorMessage(null);build.setFinishDate(new Date());buildManager.save(build);listenerRegistry.post(new BuildFinished(build));@@ -312,12 +361,12 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {public void on(SystemStopping event) {if (status == Status.RUNNING) {status = Status.STOPPING;- synchronized (this) {- notify();- }while (status == Status.STOPPING) {+ synchronized (this) {+ notify();+ }try {- Thread.sleep(100);+ Thread.sleep(1000);} catch (InterruptedException e) {}}@@ -326,20 +375,23 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {@Overridepublic synchronized void run() {- while (status == Status.RUNNING) {+ while (true) {try {wait(CHECK_INTERVAL * 1000L);} catch (InterruptedException e) {}try {- transactionManager.run(new Runnable() {+ boolean hasRunnings = transactionManager.call(new Callable<Boolean>() {@Override- public void run() {+ public Boolean call() {+ boolean hasRunnings = false;for (Build2 build: buildManager.queryUnfinished()) {if (build.getStatus() == Build2.Status.PENDING) {- DefaultJobScheduler.this.run(build);+ if (status == Status.RUNNING)+ DefaultJobScheduler.this.run(build);} else if (build.getStatus() == Build2.Status.RUNNING) {+ hasRunnings = true;ObjectId commitId = ObjectId.fromString(build.getCommitHash());try {CISpec ciSpec = build.getProject().getCISpec(commitId);@@ -347,9 +399,9 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {Job job = ciSpec.getJobMap().get(build.getJobName());if (job != null) {if (System.currentTimeMillis() - build.getRunningDate().getTime() > job.getTimeout() * 1000L) {- JobExecutor executor = settingManager.getJobExecutor(build.getRunningInstance());+ JobExecutor executor = settingManager.getJobExecutor(build.getJobInstance());if (executor != null)- executor.stop(build.getRunningInstance());+ executor.stop(build.getJobInstance());elsemarkBuildError(build, "Stopped for unknown reason");}@@ -386,9 +438,12 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {}}}+ return hasRunnings;}});+ if (!hasRunnings && status == Status.STOPPING)+ break;} catch (Exception e) {logger.error("Error checking unfinished builds", e);}diff --git a/core/src/main/java/io/onedev/server/ci/Job.java b/core/src/main/java/io/onedev/server/ci/job/Job.javasimilarity index 91%rename from core/src/main/java/io/onedev/server/ci/Job.javarename to core/src/main/java/io/onedev/server/ci/job/Job.javaindex b72f831505..fe246e4727 100644--- a/core/src/main/java/io/onedev/server/ci/Job.java+++ b/core/src/main/java/io/onedev/server/ci/job/Job.java@@ -1,4 +1,4 @@-package io.onedev.server.ci;+package io.onedev.server.ci.job;import java.io.Serializable;import java.util.ArrayList;@@ -8,7 +8,9 @@ import javax.validation.constraints.Size;import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.ci.jobtrigger.JobTrigger;+import io.onedev.server.ci.Dependency;+import io.onedev.server.ci.job.log.LogLevel;+import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.event.ProjectEvent;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.annotation.Editable;@@ -41,6 +43,8 @@ public class Job implements Serializable {private long timeout = 3600;+ private LogLevel logLevel = LogLevel.INFO;+@Editable(order=100, description="Specify name of the job")@NotEmptypublic String getName() {@@ -140,6 +144,15 @@ public class Job implements Serializable {this.timeout = timeout;}+ @Editable(order=800)+ public LogLevel getLogLevel() {+ return logLevel;+ }++ public void setLogLevel(LogLevel logLevel) {+ this.logLevel = logLevel;+ }+public JobTrigger getMatchedTrigger(ProjectEvent event) {for (JobTrigger trigger: getTriggers()) {if (trigger.matches(event, this))diff --git a/core/src/main/java/io/onedev/server/ci/job/JobCallback.java b/core/src/main/java/io/onedev/server/ci/job/JobCallback.javanew file mode 100644index 0000000000..dbb9ddd59d--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/job/JobCallback.java@@ -0,0 +1,13 @@+package io.onedev.server.ci.job;++import javax.annotation.Nullable;++import io.onedev.server.ci.job.log.JobLogger;++public interface JobCallback {++ void jobFinished(JobResult result, @Nullable String resultMessage);++ JobLogger getJobLogger();++}diff --git a/core/src/main/java/io/onedev/server/ci/job/JobResult.java b/core/src/main/java/io/onedev/server/ci/job/JobResult.javanew file mode 100644index 0000000000..57303fcd60--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/job/JobResult.java@@ -0,0 +1,3 @@+package io.onedev.server.ci.job;++public enum JobResult {SUCCESSFUL, FAILED, CANCELLED, IN_ERROR}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/ci/JobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/JobScheduler.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/ci/JobScheduler.javarename to core/src/main/java/io/onedev/server/ci/job/JobScheduler.javaindex 3fc2b99f17..c94a77a15e 100644--- a/core/src/main/java/io/onedev/server/ci/JobScheduler.java+++ b/core/src/main/java/io/onedev/server/ci/job/JobScheduler.java@@ -1,4 +1,4 @@-package io.onedev.server.ci;+package io.onedev.server.ci.job;import java.util.List;import java.util.Map;diff --git a/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java b/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.javanew file mode 100644index 0000000000..e1d2bc01d0--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java@@ -0,0 +1,218 @@+package io.onedev.server.ci.job.log;++import java.io.BufferedInputStream;+import java.io.BufferedOutputStream;+import java.io.EOFException;+import java.io.File;+import java.io.FileInputStream;+import java.io.FileOutputStream;+import java.io.IOException;+import java.io.ObjectInputStream;+import java.io.ObjectOutputStream;+import java.util.ArrayList;+import java.util.Date;+import java.util.List;+import java.util.Map;+import java.util.concurrent.ConcurrentHashMap;+import java.util.concurrent.locks.Lock;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.utils.LockUtils;+import io.onedev.server.event.build2.BuildFinished;+import io.onedev.server.model.Build2;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.storage.StorageManager;++@Singleton+public class DefaultLogManager implements LogManager {++ private static final int MIN_CACHE_ENTRIES = 5000;++ private static final int MAX_CACHE_ENTRIES = 10000;++ private static final String LOG_FILE = "build.log";++ private final StorageManager storageManager;++ private final Map<Long, LogCache> logCaches = new ConcurrentHashMap<>();++ @Inject+ public DefaultLogManager(StorageManager storageManager) {+ this.storageManager = storageManager;+ }++ private File getLogFile(Long projectId, Long buildId) {+ File buildDir = storageManager.getBuildDir(projectId, buildId);+ return new File(buildDir, LOG_FILE);+ }++ @Sessional+ @Override+ public JobLogger getLogger(Long projectId, Long buildId, LogLevel loggerLevel) {+ return new JobLogger() {++ @Override+ public void log(LogLevel logLevel, String message) {+ if (logLevel.ordinal() <= loggerLevel.ordinal()) {+ Lock lock = LockUtils.getReadWriteLock(getLockKey(buildId)).writeLock();+ lock.lock();+ try {+ LogCache logCache = logCaches.get(buildId);+ File logFile = getLogFile(projectId, buildId);+ if (logCache == null) {+ logCache = new LogCache();+ if (logFile.exists()) {+ try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {+ while (true) {+ ois.readObject();+ logCache.numOfWrittenEntries++;+ }+ } catch (EOFException e) {+ } catch (IOException | ClassNotFoundException e) {+ throw new RuntimeException(e);+ }+ }+ logCaches.put(buildId, logCache);+ }+ logCache.cachedEntries.add(new LogEntry(new Date(), logLevel, message));+ if (logCache.cachedEntries.size() > MAX_CACHE_ENTRIES) {+ try (ObjectOutputStream oos = newOutputStream(logFile)) {+ while (logCache.cachedEntries.size() > MIN_CACHE_ENTRIES) {+ LogEntry entry = logCache.cachedEntries.remove(0);+ oos.writeObject(entry);+ logCache.numOfWrittenEntries++;+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ } finally {+ lock.unlock();+ }+ }+ }++ @Override+ public LogLevel getLogLevel() {+ return loggerLevel;+ }++ };+ }++ private String getLockKey(Long buildId) {+ return "build-log: " + buildId;+ }++ private List<LogEntry> readLogEntries(File logFile, int from, int count) {+ List<LogEntry> entries = new ArrayList<>();+ if (logFile.exists()) {+ try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {+ int numOfReadEntries = 0;+ while (numOfReadEntries < from) {+ ois.readObject();+ numOfReadEntries++;+ }+ while (count == 0 || numOfReadEntries - from < count) {+ entries.add((LogEntry) ois.readObject());+ numOfReadEntries++;+ }+ } catch (EOFException e) {+ } catch (IOException | ClassNotFoundException e) {+ throw new RuntimeException(e);+ }+ }+ return entries;+ }++ private List<LogEntry> readLogEntries(List<LogEntry> cachedEntries, int from, int count) {+ if (from < cachedEntries.size()) {+ int to = from + count;+ if (to == from || to > cachedEntries.size())+ to = cachedEntries.size();+ return new ArrayList<>(cachedEntries.subList(from, to));+ } else {+ return new ArrayList<>();+ }+ }++ @Sessional+ @Override+ public List<LogEntry> readLogEntries(Build2 build, int from, int count) {+ Lock lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).readLock();+ lock.lock();+ try {+ File logFile = getLogFile(build.getProject().getId(), build.getId());+ LogCache logCache = logCaches.get(build.getId());+ if (logCache != null) {+ if (from >= logCache.numOfWrittenEntries) {+ return readLogEntries(logCache.cachedEntries, from - logCache.numOfWrittenEntries, count);+ } else {+ List<LogEntry> entries = new ArrayList<>();+ entries.addAll(readLogEntries(logFile, from, count));+ if (count == 0)+ entries.addAll(logCache.cachedEntries);+ else if (entries.size() < count)+ entries.addAll(readLogEntries(logCache.cachedEntries, 0, count - entries.size()));+ return entries;+ }+ } else {+ return readLogEntries(logFile, from, count);+ }+ } finally {+ lock.unlock();+ }+ }++ private ObjectOutputStream newOutputStream(File logFile) {+ try {+ if (logFile.exists()) {+ return new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(logFile))) {++ @Override+ protected void writeStreamHeader() throws IOException {+ reset();+ }++ };+ } else {+ return new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(logFile)));+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ @Sessional+ @Listen+ public void on(BuildFinished event) {+ Build2 build = event.getBuild();+ Lock lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).writeLock();+ lock.lock();+ try {+ LogCache logCache = logCaches.remove(build.getId());+ if (logCache != null) {+ File logFile = getLogFile(build.getProject().getId(), build.getId());+ try (ObjectOutputStream oos = newOutputStream(logFile)) {+ for (LogEntry entry: logCache.cachedEntries)+ oos.writeObject(entry);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ } finally {+ lock.unlock();+ }+ }++ static class LogCache {++ List<LogEntry> cachedEntries = new ArrayList<>();++ int numOfWrittenEntries;++ }+}diff --git a/core/src/main/java/io/onedev/server/ci/job/log/JobLogger.java b/core/src/main/java/io/onedev/server/ci/job/log/JobLogger.javanew file mode 100644index 0000000000..6dedfd0114--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/job/log/JobLogger.java@@ -0,0 +1,49 @@+package io.onedev.server.ci.job.log;++public abstract class JobLogger {++ public void trace(String message) {+ log(LogLevel.TRACE, message);+ }++ public void debug(String message) {+ log(LogLevel.DEBUG, message);+ }++ public void info(String message) {+ log(LogLevel.INFO, message);+ }++ public void warn(String message) {+ log(LogLevel.WARN, message);+ }++ public void error(String message) {+ log(LogLevel.ERROR, message);+ }++ public boolean isTraceEnabled() {+ return getLogLevel().ordinal() >= LogLevel.TRACE.ordinal();+ }++ public boolean isDebugEnabled() {+ return getLogLevel().ordinal() >= LogLevel.DEBUG.ordinal();+ }++ public boolean isInfoEnabled() {+ return getLogLevel().ordinal() >= LogLevel.INFO.ordinal();+ }++ public boolean isWarnEnabled() {+ return getLogLevel().ordinal() >= LogLevel.WARN.ordinal();+ }++ public boolean isErrorEnabled() {+ return getLogLevel().ordinal() >= LogLevel.ERROR.ordinal();+ }++ public abstract void log(LogLevel logLevel, String message);++ public abstract LogLevel getLogLevel();++}diff --git a/core/src/main/java/io/onedev/server/ci/job/log/LogEntry.java b/core/src/main/java/io/onedev/server/ci/job/log/LogEntry.javanew file mode 100644index 0000000000..7b76dfc955--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/job/log/LogEntry.java@@ -0,0 +1,34 @@+package io.onedev.server.ci.job.log;++import java.io.Serializable;+import java.util.Date;++public class LogEntry implements Serializable {++ private static final long serialVersionUID = 1L;++ private final Date date;++ private final LogLevel level;++ private final String message;++ public LogEntry(Date date, LogLevel level, String message) {+ this.date = date;+ this.level = level;+ this.message = message;+ }++ public Date getDate() {+ return date;+ }++ public LogLevel getLevel() {+ return level;+ }++ public String getMessage() {+ return message;+ }++}diff --git a/core/src/main/java/io/onedev/server/ci/job/log/LogLevel.java b/core/src/main/java/io/onedev/server/ci/job/log/LogLevel.javanew file mode 100644index 0000000000..39f9913b54--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/job/log/LogLevel.java@@ -0,0 +1,3 @@+package io.onedev.server.ci.job.log;++public enum LogLevel {ERROR, WARN, INFO, DEBUG, TRACE}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/ci/job/log/LogManager.java b/core/src/main/java/io/onedev/server/ci/job/log/LogManager.javanew file mode 100644index 0000000000..7da527668d--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/job/log/LogManager.java@@ -0,0 +1,13 @@+package io.onedev.server.ci.job.log;++import java.util.List;++import io.onedev.server.model.Build2;++public interface LogManager {++ JobLogger getLogger(Long projectId, Long buildId, LogLevel logLevel);++ List<LogEntry> readLogEntries(Build2 build, int from, int count);++}diff --git a/core/src/main/java/io/onedev/server/ci/jobparam/JobParam.java b/core/src/main/java/io/onedev/server/ci/job/param/JobParam.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/ci/jobparam/JobParam.javarename to core/src/main/java/io/onedev/server/ci/job/param/JobParam.javaindex d6280b4036..72d30813c0 100644--- a/core/src/main/java/io/onedev/server/ci/jobparam/JobParam.java+++ b/core/src/main/java/io/onedev/server/ci/job/param/JobParam.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.jobparam;+package io.onedev.server.ci.job.param;import java.io.Serializable;diff --git a/core/src/main/java/io/onedev/server/ci/jobparam/ScriptingValues.java b/core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/ci/jobparam/ScriptingValues.javarename to core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.javaindex f2f818bd0f..98404bb41e 100644--- a/core/src/main/java/io/onedev/server/ci/jobparam/ScriptingValues.java+++ b/core/src/main/java/io/onedev/server/ci/job/param/ScriptingValues.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.jobparam;+package io.onedev.server.ci.job.param;import java.util.HashMap;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/ci/jobparam/SpecifiedValues.java b/core/src/main/java/io/onedev/server/ci/job/param/SpecifiedValues.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/ci/jobparam/SpecifiedValues.javarename to core/src/main/java/io/onedev/server/ci/job/param/SpecifiedValues.javaindex d21743e28c..77ece5e6ae 100644--- a/core/src/main/java/io/onedev/server/ci/jobparam/SpecifiedValues.java+++ b/core/src/main/java/io/onedev/server/ci/job/param/SpecifiedValues.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.jobparam;+package io.onedev.server.ci.job.param;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/ci/jobparam/ValueProvider.java b/core/src/main/java/io/onedev/server/ci/job/param/ValueProvider.javasimilarity index 84%rename from core/src/main/java/io/onedev/server/ci/jobparam/ValueProvider.javarename to core/src/main/java/io/onedev/server/ci/job/param/ValueProvider.javaindex ecc9a8f6e3..626684581b 100644--- a/core/src/main/java/io/onedev/server/ci/jobparam/ValueProvider.java+++ b/core/src/main/java/io/onedev/server/ci/job/param/ValueProvider.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.jobparam;+package io.onedev.server.ci.job.param;import java.io.Serializable;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java b/core/src/main/java/io/onedev/server/ci/job/trigger/BranchPushedTrigger.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.javarename to core/src/main/java/io/onedev/server/ci/job/trigger/BranchPushedTrigger.javaindex b6a882bf0e..27f1f406dd 100644--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/job/trigger/BranchPushedTrigger.java@@ -1,4 +1,4 @@-package io.onedev.server.ci.jobtrigger;+package io.onedev.server.ci.job.trigger;import java.util.Collection;import java.util.List;@@ -7,7 +7,7 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.PathUtils;-import io.onedev.server.ci.Job;+import io.onedev.server.ci.job.Job;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.GitUtils;diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/DependencyBuiltTrigger.java b/core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/ci/jobtrigger/DependencyBuiltTrigger.javarename to core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.javaindex cff0aa7791..a515049aee 100644--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/DependencyBuiltTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/job/trigger/DependencyBuiltTrigger.java@@ -1,8 +1,8 @@-package io.onedev.server.ci.jobtrigger;+package io.onedev.server.ci.job.trigger;import io.onedev.server.ci.Dependency;-import io.onedev.server.ci.Job;-import io.onedev.server.ci.jobparam.JobParam;+import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.build2.BuildFinished;import io.onedev.server.model.Build2;diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java b/core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.javasimilarity index 85%rename from core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.javarename to core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.javaindex 83fb87178b..9b7700dded 100644--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java@@ -1,11 +1,11 @@-package io.onedev.server.ci.jobtrigger;+package io.onedev.server.ci.job.trigger;import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import io.onedev.server.ci.Job;-import io.onedev.server.ci.jobparam.JobParam;+import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.param.JobParam;import io.onedev.server.event.ProjectEvent;import io.onedev.server.web.editable.annotation.Editable;diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java b/core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.javarename to core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.javaindex 85c691b542..3129e5f7e0 100644--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.java@@ -1,7 +1,7 @@-package io.onedev.server.ci.jobtrigger;+package io.onedev.server.ci.job.trigger;import io.onedev.commons.utils.PathUtils;-import io.onedev.server.ci.Job;+import io.onedev.server.ci.job.Job;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;import io.onedev.server.web.editable.annotation.BranchPatterns;diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java b/core/src/main/java/io/onedev/server/ci/job/trigger/TagCreatedTrigger.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.javarename to core/src/main/java/io/onedev/server/ci/job/trigger/TagCreatedTrigger.javaindex dc446424b9..91def8d814 100644--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/job/trigger/TagCreatedTrigger.java@@ -1,9 +1,9 @@-package io.onedev.server.ci.jobtrigger;+package io.onedev.server.ci.job.trigger;import org.eclipse.jgit.lib.ObjectId;import io.onedev.commons.utils.PathUtils;-import io.onedev.server.ci.Job;+import io.onedev.server.ci.job.Job;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.GitUtils;diff --git a/core/src/main/java/io/onedev/server/model/Build2.java b/core/src/main/java/io/onedev/server/model/Build2.javaindex 8ecd921ef5..fe50ec57cf 100644--- a/core/src/main/java/io/onedev/server/model/Build2.java+++ b/core/src/main/java/io/onedev/server/model/Build2.java@@ -28,7 +28,7 @@ import io.onedev.server.util.jackson.DefaultView;@Index(columnList="number"), @Index(columnList="jobName"), @Index(columnList="numberStr"),@Index(columnList="status"), @Index(columnList="submitDate"), @Index(columnList="pendingDate"),@Index(columnList="runningDate"), @Index(columnList="finishDate"),- @Index(columnList="runningInstance")},+ @Index(columnList="jobInstance")},uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})})public class Build2 extends AbstractEntity {@@ -73,9 +73,9 @@ public class Build2 extends AbstractEntity {private Date finishDate;- private String runningInstance;+ private String jobInstance;- private String errorMessage;+ private String statusMessage;@OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)private Collection<BuildParam> params = new ArrayList<>();@@ -143,7 +143,12 @@ public class Build2 extends AbstractEntity {}public void setStatus(Status status) {+ setStatus(status, null);+ }++ public void setStatus(Status status, @Nullable String statusMessage) {this.status = status;+ this.statusMessage = statusMessage;}public boolean isFinished() {@@ -207,20 +212,20 @@ public class Build2 extends AbstractEntity {this.dependents = dependents;}- public String getRunningInstance() {- return runningInstance;+ public String getJobInstance() {+ return jobInstance;}- public void setRunningInstance(String runningInstance) {- this.runningInstance = runningInstance;+ public void setJobInstance(String jobInstance) {+ this.jobInstance = jobInstance;}- public String getErrorMessage() {- return errorMessage;+ public String getStatusMessage() {+ return statusMessage;}- public void setErrorMessage(String errorMessage) {- this.errorMessage = errorMessage;+ public void setStatusMessage(String statusMessage) {+ this.statusMessage = statusMessage;}public Map<String, String> getParamMap() {diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.javaindex a2eb21f24b..c389eef514 100644--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java@@ -5,6 +5,7 @@ import java.util.List;import javax.annotation.Nullable;+import io.onedev.server.ci.job.JobCallback;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Patterns;import io.onedev.server.web.editable.annotation.ProjectPatterns;@@ -82,7 +83,7 @@ public abstract class JobExecutor implements Serializable {}@Nullable- public abstract String run(String environment, List<String> commands);+ public abstract String run(String environment, List<String> commands, JobCallback callback);public abstract boolean isRunning(String runningInstance);diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalDockerExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalDockerExecutor.javaindex 7398ff842d..5a6edc25d3 100644--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalDockerExecutor.java+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalDockerExecutor.java@@ -2,6 +2,7 @@ package io.onedev.server.model.support.jobexecutor;import java.util.List;+import io.onedev.server.ci.job.JobCallback;import io.onedev.server.web.editable.annotation.Editable;@Editable(order=100)@@ -10,7 +11,7 @@ public class LocalDockerExecutor extends JobExecutor {private static final long serialVersionUID = 1L;@Override- public String run(String environment, List<String> commands) {+ public String run(String environment, List<String> commands, JobCallback callback) {return null;}diff --git a/core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java b/core/src/main/java/io/onedev/server/storage/DefaultStorageManager.javaindex cdf4bc6da3..cfa17fb9cd 100644--- a/core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java+++ b/core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java@@ -153,5 +153,18 @@ public class DefaultStorageManager implements StorageManager {FileUtils.createDir(userDir);return userDir;}++ private File getBuildsDir(Long projectId) {+ File buildsDir = new File(getProjectDir(projectId), "builds");+ FileUtils.createDir(buildsDir);+ return buildsDir;+ }++ @Override+ public File getBuildDir(Long projectId, Long buildId) {+ File buildDir = new File(getBuildsDir(projectId), String.valueOf(buildId));+ FileUtils.createDir(buildDir);+ return buildDir;+ }}diff --git a/core/src/main/java/io/onedev/server/storage/StorageManager.java b/core/src/main/java/io/onedev/server/storage/StorageManager.javaindex 46223db41f..47a358a813 100644--- a/core/src/main/java/io/onedev/server/storage/StorageManager.java+++ b/core/src/main/java/io/onedev/server/storage/StorageManager.java@@ -10,7 +10,7 @@ public interface StorageManager {* Get directory to store git repository of specified project** @return- * directory to store git repository, the directory will be exist after calling this method+ * directory to store git repository. The directory will be exist after calling this method*/File getProjectGitDir(Long projectId);@@ -18,7 +18,7 @@ public interface StorageManager {* Get directory to store Lucene index of specified project** @return- * directory to store lucene index, the directory will be exist after calling this method+ * directory to store lucene index. The directory will be exist after calling this method*/File getProjectIndexDir(Long projectId);@@ -26,7 +26,7 @@ public interface StorageManager {* Get directory to store additional info of specified project** @return- * directory to store additional info, the directory will be exist after calling this method+ * directory to store additional info. The directory will be exist after calling this method*/File getProjectInfoDir(Long projectId);@@ -34,10 +34,19 @@ public interface StorageManager {* Get directory to store attachments of specified project** @return- * directory store attachments, the directory will be exist after calling this method+ * directory store attachments. The directory will be exist after calling this method*/File getProjectAttachmentDir(Long projectId);File getUserInfoDir(Long userId);+ /**+ * Get directory to store build related files such as logs, artifacts and reports+ *+ * @return+ * directory store build related files such as logs, artifacts and reports. The directory+ * will be exist after calling this method+ */+ File getBuildDir(Long projectId, Long buildId);+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.htmlindex 616b950cff..2d5cb10e7b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.html@@ -12,7 +12,7 @@</wicket:fragment><wicket:fragment wicket:id="invalidFrag"><div class="invalid">- <div class="title">Error rendering build spec</div>+ <div class="title">Error rendering CI spec</div><div wicket:id="errorMessage" class="error-message"></div></div></wicket:fragment>diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.javaindex 8319794ffb..399467a562 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java@@ -14,7 +14,7 @@ import org.apache.wicket.model.Model;import com.google.common.base.Throwables;import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.Job;+import io.onedev.server.ci.job.Job;import io.onedev.server.git.Blob;import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.component.tabbable.AjaxActionTab;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.htmlindex 9d6e3ca65e..93f8c70664 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html@@ -30,7 +30,7 @@</wicket:fragment><wicket:fragment wicket:id="invalidFrag"><div class="invalid">- <div class="title">Error rendering build spec</div>+ <div class="title">Error rendering CI spec</div><div wicket:id="errorMessage" class="error-message"></div></div></wicket:fragment>diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.javaindex a35c603fc9..79c521fec7 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java@@ -25,7 +25,7 @@ import com.google.common.base.Throwables;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.Job;+import io.onedev.server.ci.job.Job;import io.onedev.server.migration.VersionedDocument;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.javaindex df2b9a32c2..88dd4a8ba4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java@@ -12,7 +12,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.Dependency;-import io.onedev.server.ci.Job;+import io.onedev.server.ci.job.Job;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.PathElement;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.javaindex 9e940e3401..28be0d3f2b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java@@ -26,7 +26,7 @@ import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.Dependency;-import io.onedev.server.ci.Job;+import io.onedev.server.ci.job.Job;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.component.modal.ModalLink;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditSupport.javaindex c7a27ceaf7..85d7c1e1ea 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditSupport.java@@ -8,7 +8,7 @@ import org.apache.wicket.model.IModel;import io.onedev.commons.utils.ReflectionUtils;import io.onedev.server.ci.Dependency;-import io.onedev.server.ci.Job;+import io.onedev.server.ci.job.Job;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditSupport.javaindex e1f3020897..6a36d71701 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/ParamListEditSupport.java@@ -7,7 +7,7 @@ import org.apache.wicket.Component;import org.apache.wicket.model.IModel;import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.server.ci.Job;+import io.onedev.server.ci.job.Job;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerBean.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerBean.javaindex f2251e9108..26cfede13c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerBean.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerBean.java@@ -4,7 +4,7 @@ import java.io.Serializable;import javax.validation.constraints.NotNull;-import io.onedev.server.ci.jobtrigger.JobTrigger;+import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.web.editable.annotation.Editable;@Editablediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerEditPanel.javaindex 368d582b37..9c2e343d93 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerEditPanel.java@@ -10,7 +10,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;-import io.onedev.server.ci.jobtrigger.JobTrigger;+import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditPanel.javaindex c32e0c2aa4..6ea61ee119 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditPanel.java@@ -24,7 +24,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import io.onedev.server.ci.jobtrigger.JobTrigger;+import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;import io.onedev.server.web.component.modal.ModalLink;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditSupport.javaindex 6d7d00038b..0d09529f71 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListEditSupport.java@@ -7,8 +7,8 @@ import org.apache.wicket.Component;import org.apache.wicket.model.IModel;import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.server.ci.Job;-import io.onedev.server.ci.jobtrigger.JobTrigger;+import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListViewPanel.javaindex 63447ca360..67473f724c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobtriggers/TriggerListViewPanel.java@@ -23,7 +23,7 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;-import io.onedev.server.ci.jobtrigger.JobTrigger;+import io.onedev.server.ci.job.trigger.JobTrigger;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.layout.SideFloating;diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds2/BuildListPage2.java b/core/src/main/java/io/onedev/server/web/page/project/builds2/BuildListPage2.javaindex db4874da44..ac0e9bfad2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds2/BuildListPage2.java+++ b/core/src/main/java/io/onedev/server/web/page/project/builds2/BuildListPage2.java@@ -22,7 +22,7 @@ import org.hibernate.criterion.Restrictions;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.ci.JobScheduler;+import io.onedev.server.ci.job.JobScheduler;import io.onedev.server.entitymanager.Build2Manager;import io.onedev.server.model.Build2;import io.onedev.server.model.BuildDependence;@@ -70,7 +70,7 @@ public class BuildListPage2 extends ProjectPage {public void populateItem(Item<ICellPopulator<Build2>> cellItem, String componentId,IModel<Build2> rowModel) {Build2 build = rowModel.getObject();- cellItem.add(new Label(componentId, build.getErrorMessage()));+ cellItem.add(new Label(componentId, build.getStatusMessage()));}});diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex fd503a5059..66db87025c 100644--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -1,18 +1,11 @@package io.onedev.server.web.page.test;-import java.util.ArrayList;-import java.util.List;-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.request.mapper.parameter.PageParameters;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.git.RefInfo;-import io.onedev.server.model.Project;import io.onedev.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -29,12 +22,6 @@ public class TestPage extends BasePage {@Overridepublic void onClick() {- ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);- List<RefInfo> refInfos = new ArrayList<>();- for (Project project: projectManager.query()) {- refInfos.addAll(project.getBranches());- }- System.out.println(refInfos.size());}});