Some logging changes

src/zutil/log/CompactLogFormatter.java

@@ -38,7 +38,7 @@ public class CompactLogFormatter extends Formatter{
 	// the stream should print time stamp
 	private boolean timeStamp = true;
 	//The time stamp style
-	private SimpleDateFormat dateFormatter = new SimpleDateFormat();
+	private SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
 	// If displaying class names are enabled
 	private boolean className = true;
 	// If displaying method names are enabled

src/zutil/net/http/HttpServer.java

@@ -36,6 +36,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import zutil.StringUtil;
 import zutil.log.LogUtil;
 import zutil.net.threaded.ThreadedTCPNetworkServer;
 import zutil.net.threaded.ThreadedTCPNetworkServerThread;
@@ -155,7 +156,7 @@ public class HttpServer extends ThreadedTCPNetworkServer{
 			out = new HttpPrintStream(socket.getOutputStream());
 			in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
 			this.socket = socket;
-			logger.finest("New Connection: " + socket.getInetAddress().getHostName());
+			//logger.finest("New Connection: " + socket.getInetAddress().getHostName());
 		}
 
 		public void run(){
@@ -166,6 +167,7 @@ public class HttpServer extends ThreadedTCPNetworkServer{
 
 			//****************************  REQUEST *********************************
 			try {
+				long time = System.currentTimeMillis();
 				HttpHeaderParser parser = new HttpHeaderParser(in);
 				//logger.finest(parser.toString());
 				request = parser.getURLAttributes();
@@ -215,7 +217,7 @@ public class HttpServer extends ThreadedTCPNetworkServer{
 						sessions.put( ""+session_id, client_session);
 					}
 					// renew the session TTL
-					client_session.put( "ttl", ttl_time );
+					client_session.put("ttl", ttl_time);
 				}
 				else{
 					client_session = Collections.synchronizedMap(new HashMap<String, Object>());
@@ -224,16 +226,7 @@ public class HttpServer extends ThreadedTCPNetworkServer{
 					sessions.put( ""+nextSessionId, client_session );
 					++nextSessionId;
 				}
-				// Debug
-				if(logger.isLoggable(Level.FINEST)){
-					logger.finer("Received request: "
-							+ parser.getRequestURL()
-                    		+ " (client_session: " + client_session
-							+ ", cookie: " + cookie
-							+ ", request: " + request + ")");
-				} else if(logger.isLoggable(Level.FINER)){
-					logger.finer("Received request: " + parser.getRequestURL());
-				}
+
 				//****************************  RESPONSE  ************************************
 				out.setStatusCode(200);
 				out.setHeader( "Server", SERVER_VERSION );
@@ -242,9 +235,11 @@ public class HttpServer extends ThreadedTCPNetworkServer{
 
 				if( !parser.getRequestURL().isEmpty() && pages.containsKey(parser.getRequestURL()) ){
 					pages.get(parser.getRequestURL()).respond(out, parser, client_session, cookie, request);
+					logRequest(parser, client_session, cookie, request, time);
 				}
 				else if( defaultPage != null ){
 					defaultPage.respond(out, parser, client_session, cookie, request);
+					logRequest(parser, client_session, cookie, request, time);
 				}
 				else{
 					out.setStatusCode( 404 );
@@ -271,7 +266,7 @@ public class HttpServer extends ThreadedTCPNetworkServer{
 			}
 
 			try{
-				logger.finest("Closing Connection: "+socket.getInetAddress().getHostName());
+				//logger.finest("Closing Connection: "+socket.getInetAddress().getHostName());
 				out.close();
 				in.close();
 				socket.close();
@@ -279,5 +274,25 @@ public class HttpServer extends ThreadedTCPNetworkServer{
 				logger.log(Level.WARNING, "Could not close connection", e);
 			}
 		}
+
+		private void logRequest(HttpHeaderParser parser,
+								Map<String,Object> client_session,
+								Map<String,String> cookie,
+								Map<String,String> request,
+								long time){
+			// Debug
+			if(logger.isLoggable(Level.FINEST) ){
+				logger.finer(
+						"Received request: " + parser.getRequestURL()
+						+ " (client_session: " + client_session
+						+ ", cookie: " + cookie
+						+ ", request: " + request + ")"
+						+ ", time: "+ StringUtil.formatTimeToString(System.currentTimeMillis() - time));
+			} else if(logger.isLoggable(Level.FINER)){
+				logger.finer(
+						"Received request: " + parser.getRequestURL()
+						+ ", time: "+ StringUtil.formatTimeToString(System.currentTimeMillis() - time));
+			}
+		}
 	}
 }

src/zutil/parser/Templator.java

@@ -116,7 +116,7 @@ public class Templator {
     public String compile(){
         if(file != null && lastModified != file.lastModified()){
             try {
-                log.info("Template file changed. Regenerating template...");
+                log.info("Template file("+file.getName()+") changed. Regenerating template...");
                 parseTemplate(FileUtil.getContent(file));
                 this.lastModified = file.lastModified();
             } catch(IOException e) {