vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-15 11:07:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve JS error loggin

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2022-02-11 23:56:53 -08:00
parent d567caa61c
commit 18c67233da
2 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java
View File

@ -37,6 +37,7 @@ import java.io.StringWriter;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
final public class NotificationService { final public class NotificationService {
final private static Logger logger = Logger.getLogger(Mailer.class); final private static Logger logger = Logger.getLogger(Mailer.class);
@ -65,7 +66,7 @@ final public class NotificationService {
final String subject = "[WiseMapping] " + user.getFullName() + " has shared a mindmap with you"; final String subject = "[WiseMapping] " + user.getFullName() + " has shared a mindmap with you";
// Fill template properties ... // Fill template properties ...
final Map<String, Object> model = new HashMap<String, Object>(); final Map<String, Object> model = new HashMap<>();
model.put("mindmap", mindmap); model.put("mindmap", mindmap);
model.put("message", "message"); model.put("message", "message");
model.put("ownerName", user.getFirstname()); model.put("ownerName", user.getFirstname());
@ -93,12 +94,6 @@ final public class NotificationService {
sendTemplateMail(user, mailSubject, messageTitle, messageBody); sendTemplateMail(user, mailSubject, messageTitle, messageBody);
} }
private void logErrorMessage(final Map model,
@NotNull final String templateMail) {
final String messageBody = VelocityEngineUtils.mergeTemplateIntoString(velocityEngineWrapper.getVelocityEngine(), "/mail/" + templateMail, model);
logger.error("Unexpected editor error => " + messageBody);
}
public void passwordChanged(@NotNull User user) { public void passwordChanged(@NotNull User user) {
final String mailSubject = "[WiseMapping] Your password has been changed"; final String mailSubject = "[WiseMapping] Your password has been changed";
@ -120,7 +115,7 @@ final public class NotificationService {
private void sendTemplateMail(@NotNull User user, @NotNull String mailSubject, @NotNull String messageTitle, @NotNull String messageBody) { private void sendTemplateMail(@NotNull User user, @NotNull String mailSubject, @NotNull String messageTitle, @NotNull String messageBody) {
try { try {
final Map<String, Object> model = new HashMap<String, Object>(); final Map<String, Object> model = new HashMap<>();
model.put("firstName", user.getFirstname()); model.put("firstName", user.getFirstname());
model.put("messageTitle", messageTitle); model.put("messageTitle", messageTitle);
model.put("messageBody", messageBody); model.put("messageBody", messageBody);
@ -145,7 +140,7 @@ final public class NotificationService {
public void activateAccount(@NotNull User user) { public void activateAccount(@NotNull User user) {
final Map<String, User> model = new HashMap<String, User>(); final Map<String, User> model = new HashMap<>();
model.put("user", user); model.put("user", user);
mailer.sendEmail(mailer.getServerSenderEmail(), user.getEmail(), "[WiseMapping] Active account", model, "activationAccountMail.vm"); mailer.sendEmail(mailer.getServerSenderEmail(), user.getEmail(), "[WiseMapping] Active account", model, "activationAccountMail.vm");
} }
@ -194,12 +189,15 @@ final public class NotificationService {
model.put("method", request.getMethod()); model.put("method", request.getMethod());
model.put("remoteAddress", request.getRemoteAddr()); model.put("remoteAddress", request.getRemoteAddr());
logErrorMessage(model, String errorAsString = model.keySet().stream()
"errorNotification.vm"); .map(key -> key + "=" + model.get(key))
.collect(Collectors.joining(", ", "{", "}"));
logger.error("Unexpected editor error => " + errorAsString);
} }
public void reportJavaException(@NotNull Throwable exception, @Nullable User user, @NotNull HttpServletRequest request) { public void reportJavaException(@NotNull Throwable exception, @Nullable User user, @NotNull HttpServletRequest request) {
final Map<String, String> model = new HashMap<String, String>(); final Map<String, String> model = new HashMap<>();
model.put("errorMsg", stackTraceToString(exception)); model.put("errorMsg", stackTraceToString(exception));
logError(model, user, request); logError(model, user, request);

18
wise-webapp/src/main/resources/mail/errorNotification.vm
View File

@ -1,18 +0,0 @@
User Name: ${fullName} -
Email: ${email} -
Server: ${server} -
RequestURI: ${requestURI} -
Method: ${method} -
User Agent: ${userAgent} -
Remote Address: ${remoteAddress} -
#if($mapId)
Mindmap Id: ${mapId} -
#end
#if($mapTitle)
Mindmap Title: ${mapTitle} -
#end
${errorMsg}
#if($mapXML)
${mapXML}
#end