From 23f1500287c152d143b0e6cd66e19534484d804b Mon Sep 17 00:00:00 2001
From: CodeForFame <CodeForFame@gmail.com>
Date: Tue, 21 Jun 2011 19:06:34 -0500
Subject: [PATCH] Added date format for log in config.

---
 GameServer/src/org/moparscape/msc/config/Config.java  | 3 +++
 GameServer/src/org/moparscape/msc/gs/util/Logger.java | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/GameServer/src/org/moparscape/msc/config/Config.java b/GameServer/src/org/moparscape/msc/config/Config.java
index c0ad0a2..8f3b0ce 100644
--- a/GameServer/src/org/moparscape/msc/config/Config.java
+++ b/GameServer/src/org/moparscape/msc/config/Config.java
@@ -34,6 +34,7 @@ public class Config {
 	public static int IP_BAN_REMOVAL_DELAY;
 	public static int GARBAGE_COLLECT_INTERVAL;
 	public static int SAVE_INTERVAL;
+	public static String DATE_FORMAT;
 		
 	static {
 		loadEnv();
@@ -87,6 +88,8 @@ public class Config {
 		GARBAGE_COLLECT_INTERVAL = Integer.parseInt(props.getProperty("garbage-collect-interval"));
 		SAVE_INTERVAL = Integer.parseInt(props.getProperty("save-interval"));
 		
+		DATE_FORMAT = props.getProperty("date-format");
+		
 		props.clear();
 		
 		Constants.GameServer.MOTD = "@yel@Welcome to @whi@" + Config.SERVER_NAME + "@yel@ - World @whi@" + (Config.SERVER_NUM == 0 ? 2 : Config.SERVER_NUM) + " (" + (Config.members ? "P2P" : "F2P") + ")";
diff --git a/GameServer/src/org/moparscape/msc/gs/util/Logger.java b/GameServer/src/org/moparscape/msc/gs/util/Logger.java
index 2df00ee..5070bc1 100644
--- a/GameServer/src/org/moparscape/msc/gs/util/Logger.java
+++ b/GameServer/src/org/moparscape/msc/gs/util/Logger.java
@@ -3,6 +3,7 @@ package org.moparscape.msc.gs.util;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import org.moparscape.msc.config.Config;
 import org.moparscape.msc.gs.Instance;
 import org.moparscape.msc.gs.model.World;
 
@@ -16,7 +17,7 @@ public class Logger {
 	 * Simple date formatter to keep a date on outputs
 	 */
 	private static SimpleDateFormat formatter = new SimpleDateFormat(
-			"yyyy.MM.dd HH:mm:ss");
+			Config.DATE_FORMAT);
 
 	public static void connection(Object o) {
 		// Logging.debug(o.toString());