branch develop-1.1.x updated (9d7168d8 -> bc9e8add)
This is an automated email from the git hooks/post-receive script. New change to branch develop-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 9d7168d8 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 89b7f3da Add log about time spent sending replies or forward new 5a70e8c9 Add log about database configuration used new bc9e8add fix #10064 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit bc9e8addb27b51734a822baf8dfc0cb61de1fe85 Author: jcouteau <couteau@codelutin.com> Date: Mon Aug 27 16:36:04 2018 +0200 fix #10064 WARNING : le code semble mort. Ne bloque en tout cas pas la conversion txt -> pdf. commit 5a70e8c9cbb3dc5f56d13a0866407980a72480da Author: jcouteau <couteau@codelutin.com> Date: Fri Aug 10 17:00:16 2018 +0200 Add log about database configuration used commit 89b7f3da5a877680316512f7b33b344fd9217c57 Author: jcouteau <couteau@codelutin.com> Date: Fri Aug 10 16:59:29 2018 +0200 Add log about time spent sending replies or forward Summary of changes: .../faxtomail/services/service/EmailServiceImpl.java | 17 ++++++++++++++--- .../faxtomail/FaxToMailApplicationContext.java | 1 + 2 files changed, 15 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 89b7f3da5a877680316512f7b33b344fd9217c57 Author: jcouteau <couteau@codelutin.com> Date: Fri Aug 10 16:59:29 2018 +0200 Add log about time spent sending replies or forward --- .../faxtomail/services/service/EmailServiceImpl.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index 9b816a4e..410b08b7 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -1137,6 +1137,8 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe String content, Collection<AttachmentFile> attachments, String originalEmailId, FaxToMailUser user) throws EmailException, MessagingException, IOException { + Date begin = new Date(); + Email email = getEmailById(originalEmailId, Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, Email.PROPERTY_REPLIES); @@ -1178,8 +1180,12 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe message.attach(source, attachmentFile.getFilename(), null); } + Date beforeSendingMessage = new Date(); + message.send(); + Date afterSendingMessage = new Date(); + ReplyTopiaDao replyTopiaDao = getPersistenceContext().getReplyDao(); ReplyContentTopiaDao replyContentTopiaDao = getPersistenceContext().getReplyContentDao(); Date now = new Date(); @@ -1219,6 +1225,14 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe Client client = email.getClient(); email = saveEmail(email, null, null, client != null ? client.getCode() : null, user); + Date postSendingOperations = new Date(); + + if (log.isDebugEnabled()) { + log.debug("Message preparation took : " + (beforeSendingMessage.getTime() - begin.getTime()) + " ms"); + log.debug("Message sending (outside FTM) took : " + (afterSendingMessage.getTime() - beforeSendingMessage.getTime()) + " ms"); + log.debug("Post sending operations took : " + (postSendingOperations.getTime() - afterSendingMessage.getTime()) + " ms"); + } + return email; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 5a70e8c9cbb3dc5f56d13a0866407980a72480da Author: jcouteau <couteau@codelutin.com> Date: Fri Aug 10 17:00:16 2018 +0200 Add log about database configuration used --- .../main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java | 1 + 1 file changed, 1 insertion(+) diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java index e7c85777..52d744ed 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java @@ -96,6 +96,7 @@ public class FaxToMailApplicationContext { properties.putAll(applicationConfig.getTopiaProperties()); // create application + log.debug("Configuration used : " + properties); topiaApplicationContext = new FaxToMailTopiaApplicationContext(properties); /*if (getApplicationConfig().isLogConfigurationProvided()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit bc9e8addb27b51734a822baf8dfc0cb61de1fe85 Author: jcouteau <couteau@codelutin.com> Date: Mon Aug 27 16:36:04 2018 +0200 fix #10064 WARNING : le code semble mort. Ne bloque en tout cas pas la conversion txt -> pdf. --- .../com/franciaflex/faxtomail/services/service/EmailServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index 410b08b7..ef6d0047 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -2211,9 +2211,6 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe attachment.setOriginalFileName(name + ".pdf"); attachment.setAddedByUser(false); - File tempFile = File.createTempFile(name, ".pdf"); - tempFile.createNewFile(); - Files.write(attachmentFileNew.getContent(), tempFile); return attachment; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm