Skip to content
Snippets Groups Projects
Commit 564d8e16 authored by srosse's avatar srosse
Browse files

OO-4368: find user in red screen's feedback, update log4j2.xml example

parent a23266c3
No related branches found
No related tags found
No related merge requests found
...@@ -81,14 +81,14 @@ public class ErrorFeedbackMailer implements Dispatcher { ...@@ -81,14 +81,14 @@ public class ErrorFeedbackMailer implements Dispatcher {
public void sendMail(HttpServletRequest request) { public void sendMail(HttpServletRequest request) {
String feedback = request.getParameter("textarea"); String feedback = request.getParameter("textarea");
String errorNr = request.getParameter("fx_errnum"); String errorNr = request.getParameter("fx_errnum");
String username = request.getParameter("username"); String identityKey = request.getParameter("username");
try { try {
if(StringHelper.containsNonWhitespace(username)) { if(StringHelper.isLong(identityKey)) {
Identity ident = securityManager.findIdentityByName(username); Identity ident = securityManager.loadIdentityByKey(Long.valueOf(identityKey));
Collection<String> logFileEntries = LogFileParser.getErrorToday(errorNr, false); Collection<String> logFileEntries = LogFileParser.getErrorToday(errorNr, false);
StringBuilder out = new StringBuilder(2048); StringBuilder out = new StringBuilder(2048);
out.append(feedback) out.append(feedback)
.append("\n------------------------------------------\n\n --- from user: ").append(username).append(" ---"); .append("\n------------------------------------------\n\n --- from user: ").append(identityKey).append(" ---");
if (logFileEntries != null) { if (logFileEntries != null) {
for (Iterator<String> iter = logFileEntries.iterator(); iter.hasNext();) { for (Iterator<String> iter = logFileEntries.iterator(); iter.hasNext();) {
out.append(iter.next()); out.append(iter.next());
...@@ -111,8 +111,7 @@ public class ErrorFeedbackMailer implements Dispatcher { ...@@ -111,8 +111,7 @@ public class ErrorFeedbackMailer implements Dispatcher {
private void handleException(HttpServletRequest request, Exception e) { private void handleException(HttpServletRequest request, Exception e) {
String feedback = request.getParameter("textarea"); String feedback = request.getParameter("textarea");
String username = request.getParameter("username"); String username = request.getParameter("username");
log.error("Error sending error feedback mail to OpenOLAT error support (" + WebappHelper.getMailConfig("mailError") + ") from: " log.error("Error sending error feedback mail to OpenOLAT error support ({}) from: {} with content: {}", WebappHelper.getMailConfig("mailError"), username, feedback, e);
+ username + " with content: " + feedback, e);
} }
@Override @Override
......
<Configuration status="WARN"> <Configuration status="WARN">
<Appenders> <Appenders>
<Console name="Console" target="SYSTEM_OUT"> <Console name="Console" target="SYSTEM_OUT">
<!-- This pattern is mean for development purpose only -->
<PatternLayout <PatternLayout
pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" /> pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
<!-- This pattern is used on OpenOLAT cloud AND the OpenOlat code to send feedback per email
<PatternLayout
pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %marker %c{1} ^%%^ I%X{ref}-J%sn ^%%^ %logger{36} ^%%^ %X{identityKey} ^%%^ %X{ip} ^%%^ %X{referer} ^%%^ %X{userAgent} ^%%^ %msg%ex{full,separator( )}%n" />
-->
<!-- This pattern mimic the previous OLog formatting (but not exactly) <!-- This pattern mimic the previous OLog formatting (but not exactly)
<PatternLayout <PatternLayout
pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %marker %c{1} ^%%^ N${sys:nodeId}-R%X{ref}-M%sn ^%%^ %logger{36} ^%%^ %X{identityKey} ^%%^ %X{ip} ^%%^ %X{referer} ^%%^ %X{userAgent} ^%%^ %msg%ex{full,separator( )}%n" /> pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %marker %c{1} ^%%^ N${sys:nodeId}-R%X{ref}-M%sn ^%%^ %logger{36} ^%%^ %X{identityKey} ^%%^ %X{ip} ^%%^ %X{referer} ^%%^ %X{userAgent} ^%%^ %msg%ex{full,separator( )}%n" />
--> -->
<!-- This pattern is used on OpenOLAT cloud
<PatternLayout
pattern="%d{dd MMM yyyy HH:mm:ss.SSS} [%t] %-5level %marker %c{1} ^%%^ I%X{ref}-J%sn ^%%^ %logger{36} ^%%^ %X{identityKey} ^%%^ %X{ip} ^%%^ %X{referer} ^%%^ %X{userAgent} ^%%^ %msg%ex{full,separator( )}%n" />
-->
</Console> </Console>
<!-- File append with the pattern optimized to send feedback per email, don't forget to update the AppenderRef below -->
<!-- <!--
<RollingFile name="RollingFile" fileName="/path_to_logs/logs/olat.log" <RollingFile name="RollingFile" fileName="/path_to_logs/logs/olat.log"
filePattern="/path_to_logs/logs/olat.log.%d{yyyy-MM-dd}"> filePattern="/path_to_logs/logs/olat.log.%d{yyyy-MM-dd}">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment