details: https://code.openbravo.com/erp/devel/pi/rev/e0749d9a2b25
changeset: 35117:e0749d9a2b25
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Nov 23 13:21:32 2018 +0100
summary: related to bug 39649: small refactors
- removed redundant comments
- no need to define small method to invoke from lambda
- added some context to log
diffstat:
src/org/openbravo/email/EmailEventManager.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diffs (46 lines):
diff -r c6de12285e53 -r e0749d9a2b25
src/org/openbravo/email/EmailEventManager.java
--- a/src/org/openbravo/email/EmailEventManager.java Fri Nov 23 09:07:17
2018 +0100
+++ b/src/org/openbravo/email/EmailEventManager.java Fri Nov 23 13:21:32
2018 +0100
@@ -100,8 +100,13 @@
.build();
if (gen.isAsynchronous()) {
- Thread thread = new Thread(() -> sendEmailOrCatchError(mailConfig,
email));
- thread.start();
+ new Thread(() -> {
+ try {
+ EmailManager.sendEmail(mailConfig, email);
+ } catch (Exception e) {
+ log.error("Failed to send email for event {} with generator
{}.", event, gen, e);
+ }
+ }).start();
} else {
EmailManager.sendEmail(mailConfig, email);
}
@@ -116,25 +121,15 @@
}
return sent;
} catch (Exception e) {
- log.error(e.getMessage(), e);
+ log.error("Failed to send email for event {}.", event, e);
throw new EmailEventException(e);
}
}
- private void sendEmailOrCatchError(EmailServerConfiguration config,
EmailInfo email) {
- try {
- EmailManager.sendEmail(config, email);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- }
- }
-
private List<EmailEventContentGenerator> getValidEmailGenerators(String
event, Object data) {
return StreamSupport
.stream(Spliterators.spliteratorUnknownSize(emailGenerators.iterator(), 0),
false)
- // find valid events
.filter(gen -> gen.isValidEvent(event, data))
- // sort them by priority
.sorted(Comparator.comparing(EmailEventContentGenerator::getPriority))
.collect(Collectors.toList());
}
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
