From a7887974e445b867e0cc6c220743a067a2320b2c Mon Sep 17 00:00:00 2001
From: tilman <tliero@gmx.net>
Date: Mon, 8 Oct 2012 12:15:39 +0200
Subject: [PATCH] Bugfix

---
 src/main/java/de/tilman/log4j/EmailCollector.java | 9 +++++++--
 src/main/java/de/tilman/synctool/SyncTool.java    | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/tilman/log4j/EmailCollector.java b/src/main/java/de/tilman/log4j/EmailCollector.java
index ea4107c..329282d 100644
--- a/src/main/java/de/tilman/log4j/EmailCollector.java
+++ b/src/main/java/de/tilman/log4j/EmailCollector.java
@@ -1,5 +1,7 @@
 package de.tilman.log4j;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.Properties;
 
@@ -30,10 +32,13 @@ public class EmailCollector extends AppenderSkeleton {
 	private String emailRecipient;
 	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) {
+		this.setName("EmailCollector");
 		this.bufferSize = bufferSize;
 		lineBuffer = new LinkedList<String>();
-		this.smtpUser= smtpUser;
+		this.smtpUser = smtpUser;
 		this.smtpPassword = smtpPassword;
 		this.emailRecipient = emailRecipient;
 		this.emailSubject = emailSubject;
@@ -92,7 +97,7 @@ public class EmailCollector extends AppenderSkeleton {
 		if (lineBuffer.size() >= bufferSize) {
 			lineBuffer.removeFirst();
 		}
-		lineBuffer.add(event.toString());
+		lineBuffer.add(formatter.format(new Date(event.getTimeStamp())) + " - " + event.getRenderedMessage());
 	}
 
 }
diff --git a/src/main/java/de/tilman/synctool/SyncTool.java b/src/main/java/de/tilman/synctool/SyncTool.java
index 499c0fe..1668ac9 100644
--- a/src/main/java/de/tilman/synctool/SyncTool.java
+++ b/src/main/java/de/tilman/synctool/SyncTool.java
@@ -591,8 +591,9 @@ public class SyncTool {
 		}
 		
 		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"));
+			
 		}
 		
 		if (config.getString("jabber address") != null) {