opendev/gerrit
Code Issues Proposed changes

Log errors when sending change reverted notification email

Browse Source 
Change-Id: I48f124af59d2ee68e573ccda9b2799cf07963973
This commit is contained in:
David Pursehouse
2013-07-11 11:09:50 +09:00
parent 585ecde311
commit c8fe07b8f0
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
View File

@@ -61,6 +61,8 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.transport.ReceiveCommand; import org.eclipse.jgit.transport.ReceiveCommand;
import org.eclipse.jgit.util.ChangeIdUtil; import org.eclipse.jgit.util.ChangeIdUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException; import java.io.IOException;
import java.sql.Timestamp; import java.sql.Timestamp;
@@ -81,6 +83,9 @@ public class ChangeUtil {
private static int uuidPrefix; private static int uuidPrefix;
private static int uuidSeq; private static int uuidSeq;
private static final Logger log =
LoggerFactory.getLogger(ChangeUtil.class);
/** /**
* Generate a new unique identifier for change message entities. * Generate a new unique identifier for change message entities.
* *
@@ -290,10 +295,15 @@ public class ChangeUtil {
ins.setMessage(cmsg).insert(); ins.setMessage(cmsg).insert();
final RevertedSender cm = revertedSenderFactory.create(change); try {
cm.setFrom(user.getAccountId()); final RevertedSender cm = revertedSenderFactory.create(change);
cm.setChangeMessage(cmsg); cm.setFrom(user.getAccountId());
cm.send(); cm.setChangeMessage(cmsg);
cm.send();
} catch (Exception err) {
log.error("Cannot send email for revert change " + change.getId(),
err);
}
return change.getId(); return change.getId();
} finally { } finally {