tilman/SyncTool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix

Browse Source
This commit is contained in:
tilman
2012-10-08 12:15:39 +02:00
parent 8b4eac33fc
commit a7887974e4
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/tilman/log4j/EmailCollector.java
+7 -2
View File
@@ -1,5 +1,7 @@
package de.tilman.log4j; package de.tilman.log4j;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Properties; import java.util.Properties;
@@ -30,10 +32,13 @@ public class EmailCollector extends AppenderSkeleton {
private String emailRecipient; private String emailRecipient;
private String emailSubject; private String emailSubject;
private SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss,S");
public EmailCollector(int bufferSize, String smtpUser, String smtpPassword, String emailRecipient, String emailSubject) { public EmailCollector(int bufferSize, String smtpUser, String smtpPassword, String emailRecipient, String emailSubject) {
this.setName("EmailCollector");
this.bufferSize = bufferSize; this.bufferSize = bufferSize;
lineBuffer = new LinkedList<String>(); lineBuffer = new LinkedList<String>();
this.smtpUser= smtpUser; this.smtpUser = smtpUser;
this.smtpPassword = smtpPassword; this.smtpPassword = smtpPassword;
this.emailRecipient = emailRecipient; this.emailRecipient = emailRecipient;
this.emailSubject = emailSubject; this.emailSubject = emailSubject;
@@ -92,7 +97,7 @@ public class EmailCollector extends AppenderSkeleton {
if (lineBuffer.size() >= bufferSize) { if (lineBuffer.size() >= bufferSize) {
lineBuffer.removeFirst(); lineBuffer.removeFirst();
} }
lineBuffer.add(event.toString()); lineBuffer.add(formatter.format(new Date(event.getTimeStamp())) + " - " + event.getRenderedMessage());
} }
} }
src/main/java/de/tilman/synctool/SyncTool.java
+2 -1
View File
@@ -591,8 +591,9 @@ public class SyncTool {
} }
if (config.getString("SMTP user") != null) { if (config.getString("SMTP user") != null) {
BasicConfigurator.configure(new EmailCollector(200, config.getString("smtpuser"), config.getString("smtppassword"), config.getString("email"), "SyncTool Report")); BasicConfigurator.configure(new EmailCollector(200, config.getString("SMTP user"), config.getString("SMTP password"), config.getString("e-mail address"), "SyncTool Report"));
log.info("Prepared e-mail report for " + config.getString("e-mail address")); log.info("Prepared e-mail report for " + config.getString("e-mail address"));
} }
if (config.getString("jabber address") != null) { if (config.getString("jabber address") != null) {