The Unified and Autonomous Development Platform
Make some debug statements as trace. Ignore non-branch and non-tag ref updates when collecting commit information.
robin shen3c015e5bd97b
diff --git a/core/src/main/java/com/gitplex/server/git/command/BlameCommand.java b/core/src/main/java/com/gitplex/server/git/command/BlameCommand.javaindex 182416bdd8..519ccba1c3 100644--- a/core/src/main/java/com/gitplex/server/git/command/BlameCommand.java+++ b/core/src/main/java/com/gitplex/server/git/command/BlameCommand.java@@ -130,7 +130,7 @@ public class BlameCommand extends GitCommand<Map<String, Blame>> {public void consume(String line) {if (line.startsWith("fatal: file ") && line.contains("has only ")) {endOfFile.set(true);- logger.debug(line.substring("fatal: ".length()));+ logger.trace(line.substring("fatal: ".length()));} else {logger.error(line);}diff --git a/core/src/main/java/com/gitplex/server/git/command/CloneCommand.java b/core/src/main/java/com/gitplex/server/git/command/CloneCommand.javaindex 3a16ec9014..06f3a68b03 100644--- a/core/src/main/java/com/gitplex/server/git/command/CloneCommand.java+++ b/core/src/main/java/com/gitplex/server/git/command/CloneCommand.java@@ -82,7 +82,7 @@ public class CloneCommand extends GitCommand<Void> {@Overridepublic void consume(String line) {- logger.debug(line);+ logger.trace(line);}}, new LineConsumer(){@@ -90,7 +90,7 @@ public class CloneCommand extends GitCommand<Void> {@Overridepublic void consume(String line) {if (line.startsWith("Cloning into ") || line.equals("done."))- logger.debug(line);+ logger.trace(line);else if (line.contains("You appear to have cloned an empty repository"))logger.warn(line);elsediff --git a/core/src/main/java/com/gitplex/server/git/command/FetchCommand.java b/core/src/main/java/com/gitplex/server/git/command/FetchCommand.javaindex 05a9e6465e..bcf1ccb941 100644--- a/core/src/main/java/com/gitplex/server/git/command/FetchCommand.java+++ b/core/src/main/java/com/gitplex/server/git/command/FetchCommand.java@@ -46,7 +46,7 @@ public class FetchCommand extends GitCommand<Void> {@Overridepublic void consume(String line) {- logger.debug(line);+ logger.trace(line);}}, new LineConsumer() {diff --git a/core/src/main/java/com/gitplex/server/git/config/CurlConfig.java b/core/src/main/java/com/gitplex/server/git/config/CurlConfig.javaindex be68c1b413..de600f5850 100644--- a/core/src/main/java/com/gitplex/server/git/config/CurlConfig.java+++ b/core/src/main/java/com/gitplex/server/git/config/CurlConfig.java@@ -40,7 +40,7 @@ public abstract class CurlConfig implements Serializable, Validatable {@Overridepublic void consume(String line) {- logger.debug(line);+ logger.trace(line);}}, new LineConsumer() {diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.javaindex e3005440b1..3771eaf78c 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java@@ -32,6 +32,8 @@ import org.eclipse.jgit.lib.Ref;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevObject;import org.eclipse.jgit.revwalk.RevWalk;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;import com.gitplex.launcher.loader.Listen;import com.gitplex.server.event.RefUpdated;@@ -74,6 +76,8 @@ import jetbrains.exodus.env.TransactionalExecutable;@Singletonpublic class DefaultCommitInfoManager extends AbstractEnvironmentManager implements CommitInfoManager {+ private static final Logger logger = LoggerFactory.getLogger(DefaultCommitInfoManager.class);+private static final int INFO_VERSION = 1;private static final long LOG_FILE_SIZE = 256*1024;@@ -624,12 +628,14 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme@Overridepublic Void call() throws Exception {Project project = projectManager.load(projectId);- List<RevCommit> commits = new ArrayList<>();+ List<CollectingWork> collectingWorks = new ArrayList<>();for (Object work: works)- commits.add(((CollectingWork)work).getCommit());- commits.sort(Comparator.comparing(RevCommit::getCommitTime));- for (RevCommit commit: commits) {- doCollect(project, commit.copy(), true);+ collectingWorks.add((CollectingWork)work);+ Collections.sort(collectingWorks);+ for (CollectingWork work: collectingWorks) {+ logger.debug("Collecting commit information up to ref '{}' in project '{}'...",+ work.getRefName(), project.getName());+ doCollect(project, work.getCommit().copy(), true);}return null;}@@ -641,7 +647,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme}private void collect(Project project) {- List<RevCommit> commits = new ArrayList<>();+ List<CollectingWork> works = new ArrayList<>();try (RevWalk revWalk = new RevWalk(project.getRepository())) {Collection<Ref> refs = new ArrayList<>();refs.addAll(project.getRepository().getRefDatabase().getRefs(Constants.R_HEADS).values());@@ -666,18 +672,17 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme});if (!collected)- commits.add(commit);+ works.add(new CollectingWork(PRIORITY, commit, ref.getName()));}}} catch (IOException e) {throw new RuntimeException(e);}- commits.sort(Comparator.comparing(RevCommit::getCommitTime));- for (RevCommit commit: commits) {- CollectingWork work = new CollectingWork(PRIORITY, commit);+ Collections.sort(works);++ for (CollectingWork work: works)batchWorkManager.submit(getBatchWorker(project), work);- }}@Sessional@@ -691,11 +696,13 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme@Listenpublic void on(RefUpdated event) {- if (!event.getNewObjectId().equals(ObjectId.zeroId())) {+ if (!event.getNewObjectId().equals(ObjectId.zeroId())+ && (event.getRefName().startsWith(Constants.R_HEADS)+ || event.getRefName().startsWith(Constants.R_TAGS))) {try (RevWalk revWalk = new RevWalk(event.getProject().getRepository())) {RevCommit commit = GitUtils.parseCommit(revWalk, event.getNewObjectId());if (commit != null) {- CollectingWork work = new CollectingWork(PRIORITY, commit);+ CollectingWork work = new CollectingWork(PRIORITY, commit, event.getRefName());batchWorkManager.submit(getBatchWorker(event.getProject()), work);}}@@ -726,18 +733,30 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemereturn commitCount;}- static class CollectingWork extends Prioritized {+ static class CollectingWork extends Prioritized implements Comparable<CollectingWork> {++ private final String refName;private final RevCommit commit;- public CollectingWork(int priority, RevCommit commit) {+ public CollectingWork(int priority, RevCommit commit, String refName) {super(priority);this.commit = commit;+ this.refName = refName;}public RevCommit getCommit() {return commit;}++ public String getRefName() {+ return refName;+ }++ @Override+ public int compareTo(CollectingWork o) {+ return commit.getCommitTime() - o.getCommit().getCommitTime();+ }}diff --git a/core/src/main/java/com/gitplex/server/util/concurrent/Prioritized.java b/core/src/main/java/com/gitplex/server/util/concurrent/Prioritized.javaindex a1011b7e86..10ed544c41 100644--- a/core/src/main/java/com/gitplex/server/util/concurrent/Prioritized.java+++ b/core/src/main/java/com/gitplex/server/util/concurrent/Prioritized.java@@ -13,9 +13,4 @@ public class Prioritized implements PriorityAware {return priority;}- @Override- public int compareTo(PriorityAware o) {- return priority - o.getPriority();- }-}diff --git a/core/src/main/java/com/gitplex/server/util/concurrent/PriorityAware.java b/core/src/main/java/com/gitplex/server/util/concurrent/PriorityAware.javaindex 3b8bd36d76..f6a60e54ca 100644--- a/core/src/main/java/com/gitplex/server/util/concurrent/PriorityAware.java+++ b/core/src/main/java/com/gitplex/server/util/concurrent/PriorityAware.java@@ -1,5 +1,5 @@package com.gitplex.server.util.concurrent;-public interface PriorityAware extends Comparable<PriorityAware> {- int getPriority();+public interface PriorityAware {+ int getPriority();}diff --git a/core/src/main/java/com/gitplex/server/util/execution/Commandline.java b/core/src/main/java/com/gitplex/server/util/execution/Commandline.javaindex 3a682596c8..977b0a576b 100644--- a/core/src/main/java/com/gitplex/server/util/execution/Commandline.java+++ b/core/src/main/java/com/gitplex/server/util/execution/Commandline.java@@ -122,7 +122,7 @@ public class Commandline {processBuilder.environment().putAll(environments);if (logger.isDebugEnabled()) {- logger.debug("Executing command: " + this);+ logger.trace("Executing command: " + this);logger.trace("Command working directory: " +processBuilder.directory().getAbsolutePath());StringBuffer buffer = new StringBuffer();diff --git a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.javaindex 3d927ad9f1..f9aa8ef5b8 100644--- a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java+++ b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java@@ -375,9 +375,6 @@ public class DefaultIndexManager implements IndexManager {listenerRegistry.post(new CommitIndexed(project, commit.copy()));- logger.debug("Commit indexed (project: {}, commit: {}, checked blobs: {}, indexed blobs: {})",- project.getName(), commit.name(), indexResult.getChecked(), indexResult.getIndexed());-return indexResult;}