opendev/gerrit
Code Issues Proposed changes

Do not fail when invalid commentlinks are configured in gerrit.config

Browse Source 
Commentlinks are not critical for running Gerrit, just log a warning
for invalid commentlinks, but do not fail.

Change-Id: Ia67da42ee3f5db1d128d57f276daf3f1d0bba0b8
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2016-08-05 16:55:36 +02:00
committed by David Pursehouse
parent 271ee3fab2
commit 8f87b40905
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gerrit-server/src/main/java/com/google/gerrit/server/project/CommentLinkProvider.java
View File

@@ -20,14 +20,18 @@ import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.git.ProjectConfig;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
import com.google.inject.ProvisionException;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
public class CommentLinkProvider implements Provider<List<CommentLinkInfo>> { public class CommentLinkProvider implements Provider<List<CommentLinkInfo>> {
private static final Logger log =
LoggerFactory.getLogger(CommentLinkProvider.class);
private final Config cfg; private final Config cfg;
@Inject @Inject
@@ -41,12 +45,16 @@ public class CommentLinkProvider implements Provider<List<CommentLinkInfo>> {
List<CommentLinkInfo> cls = List<CommentLinkInfo> cls =
Lists.newArrayListWithCapacity(subsections.size()); Lists.newArrayListWithCapacity(subsections.size());
for (String name : subsections) { for (String name : subsections) {
try {
CommentLinkInfo cl = ProjectConfig.buildCommentLink(cfg, name, true); CommentLinkInfo cl = ProjectConfig.buildCommentLink(cfg, name, true);
if (cl.isOverrideOnly()) { if (cl.isOverrideOnly()) {
throw new ProvisionException( log.warn("commentlink " + name + " empty except for \"enabled\"");
"commentlink " + name + " empty except for \"enabled\""); continue;
} }
cls.add(cl); cls.add(cl);
} catch (IllegalArgumentException e) {
log.warn("invalid commentlink: " + e.getMessage());
}
} }
return ImmutableList.copyOf(cls); return ImmutableList.copyOf(cls);
} }