diff --git a/Zutil.jar b/Zutil.jar index ff6cceb..f202517 100755 Binary files a/Zutil.jar and b/Zutil.jar differ diff --git a/src/zutil/log/LogUtil.java b/src/zutil/log/LogUtil.java index 0928e28..e8962a3 100755 --- a/src/zutil/log/LogUtil.java +++ b/src/zutil/log/LogUtil.java @@ -24,6 +24,10 @@ package zutil.log; +import zutil.io.file.FileUtil; + +import java.io.FileInputStream; +import java.util.Enumeration; import java.util.logging.*; /** @@ -40,13 +44,13 @@ public class LogUtil { * @return a new Logger for the calling class */ public static Logger getLogger(){ - return Logger.getLogger(getCalingClass()); + return Logger.getLogger(getCallingClass()); } /** * @return the parent class other than Logger in the stack */ - public static String getCalingClass(){ + public static String getCallingClass(){ StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace(); for(int i=1; i client_session, - Map cookie, - Map 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)); - } - } } + + protected static void logRequest(HttpHeaderParser parser, + Map client_session, + Map cookie, + Map 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)); + } + } } diff --git a/test/zutil/test/SSDPClientTest.java b/test/zutil/test/SSDPClientTest.java old mode 100644 new mode 100755 index 5bd25cb..efc91fc --- a/test/zutil/test/SSDPClientTest.java +++ b/test/zutil/test/SSDPClientTest.java @@ -35,7 +35,7 @@ import java.util.logging.Level; public class SSDPClientTest { public static void main(String[] args) throws IOException { - System.out.println(LogUtil.getCalingClass()); + System.out.println(LogUtil.getCallingClass()); LogUtil.setGlobalLevel(Level.FINEST); SSDPClient ssdp = new SSDPClient(); ssdp.requestService("upnp:rootdevice");