opendev/gerrit
Code Issues Proposed changes

Add extension point to register JGit PostUploadHooks

Browse Source 
Plugins may register PostUploadHook instances in order to get notified
after JGit is done uploading a pack.

Now that PostUploadHook can be registered using the DynamicSet, use that
mechanism to register UploadPackMetricsHook.

Change-Id: If848bddc85ca8923a5d55f7dd448ac218c910e1c
This commit is contained in:
Hugo Arès
2016-08-02 15:26:57 -04:00
parent 7acf5164ba
commit 41b4c0d3da
5 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java
View File

@@ -21,7 +21,6 @@ import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.git.SearchingChangeCacheImpl;
import com.google.gerrit.server.git.TagCache;
import com.google.gerrit.server.git.TransferConfig;
import com.google.gerrit.server.git.UploadPackMetricsHook;
import com.google.gerrit.server.git.VisibleRefFilter;
import com.google.gerrit.server.git.validators.UploadValidationException;
import com.google.gerrit.server.git.validators.UploadValidators;
@@ -30,6 +29,8 @@ import com.google.gerrit.sshd.AbstractGitCommand;
import com.google.gerrit.sshd.SshSession;
import com.google.inject.Inject;
import org.eclipse.jgit.transport.PostUploadHook;
import org.eclipse.jgit.transport.PostUploadHookChain;
import org.eclipse.jgit.transport.PreUploadHook;
import org.eclipse.jgit.transport.PreUploadHookChain;
import org.eclipse.jgit.transport.UploadPack;
@@ -58,15 +59,15 @@ final class Upload extends AbstractGitCommand {
@Inject
private DynamicSet<PreUploadHook> preUploadHooks;
@Inject
private DynamicSet<PostUploadHook> postUploadHooks;
@Inject
private UploadValidators.Factory uploadValidatorsFactory;
@Inject
private SshSession session;
@Inject
private UploadPackMetricsHook uploadMetrics;
@Override
protected void runImpl() throws IOException, Failure {
if (!projectControl.canRunUploadPack()) {
@@ -80,7 +81,8 @@ final class Upload extends AbstractGitCommand {
true));
up.setPackConfig(config.getPackConfig());
up.setTimeout(config.getTimeout());
up.setPostUploadHook(uploadMetrics);
up.setPostUploadHook(
PostUploadHookChain.newChain(Lists.newArrayList(postUploadHooks)));
List<PreUploadHook> allPreUploadHooks = Lists.newArrayList(preUploadHooks);
allPreUploadHooks.add(uploadValidatorsFactory.create(project, repo,