opendev/gerrit
Code Issues Proposed changes

Merge "Do not fail PostReviewers with 500 if emails cannot be sent"

Browse Source
This commit is contained in:
Edwin Kempin 2013-08-29 13:05:44 +00:00 committed by Gerrit Code Review
commit 39280edfd3
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
View File

@ -56,6 +56,8 @@ import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.text.MessageFormat; import java.text.MessageFormat;
@ -63,6 +65,9 @@ import java.util.List;
import java.util.Set; import java.util.Set;
public class PostReviewers implements RestModifyView<ChangeResource, Input> { public class PostReviewers implements RestModifyView<ChangeResource, Input> {
private static final Logger log = LoggerFactory
.getLogger(PostReviewers.class);
public static final int DEFAULT_MAX_REVIEWERS_WITHOUT_CHECK = 10; public static final int DEFAULT_MAX_REVIEWERS_WITHOUT_CHECK = 10;
public static final int DEFAULT_MAX_REVIEWERS = 20; public static final int DEFAULT_MAX_REVIEWERS = 20;
@ -279,12 +284,15 @@ public class PostReviewers implements RestModifyView<ChangeResource, Input> {
} }
} }
if (!added.isEmpty()) { if (!added.isEmpty()) {
AddReviewerSender cm; try {
AddReviewerSender cm = addReviewerSenderFactory.create(change);
cm = addReviewerSenderFactory.create(change); cm.setFrom(currentUser.getAccountId());
cm.setFrom(currentUser.getAccountId()); cm.addReviewers(added);
cm.addReviewers(added); cm.send();
cm.send(); } catch (Exception err) {
log.error("Cannot send email to new reviewers of change "
+ change.getId(), err);
}
} }
} }