Author: [log in to unmask]
Date: Mon Feb  9 19:09:09 2015
New Revision: 3518

Log:
Changes to logging util classes.

Added:
    projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/BasicLogFormatter.java
      - copied, changed from r3517, projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/BasicFormatter.java
    projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/DefaultLogFormatter.java
      - copied, changed from r3517, projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/DefaultFormatter.java
Removed:
    projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/BasicFormatter.java
    projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/DefaultFormatter.java
Modified:
    projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/LogUtil.java

Copied: projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/BasicLogFormatter.java (from r3517, projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/BasicFormatter.java)
 =============================================================================
--- projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/BasicFormatter.java	(original)
+++ projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/BasicLogFormatter.java	Mon Feb  9 19:09:09 2015
@@ -5,15 +5,15 @@
 import java.util.logging.Formatter;
 import java.util.logging.LogRecord;
 
-public class BasicFormatter extends Formatter {
+public class BasicLogFormatter extends Formatter {
     
     String prepend = null;
     
-    public BasicFormatter(String prepend) {
+    public BasicLogFormatter(String prepend) {
         this.prepend = prepend;
     }
     
-    public BasicFormatter() {        
+    public BasicLogFormatter() {        
     }
     
     public String format(LogRecord record) {

Copied: projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/DefaultLogFormatter.java (from r3517, projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/DefaultFormatter.java)
 =============================================================================
--- projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/DefaultFormatter.java	(original)
+++ projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/DefaultLogFormatter.java	Mon Feb  9 19:09:09 2015
@@ -1,16 +1,56 @@
 package org.lcsim.util.log;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.Date;
 import java.util.logging.Formatter;
 import java.util.logging.LogRecord;
 
-public class DefaultFormatter extends Formatter {
+/**
+ * <p>
+ * The default log formatter for logging in LCSim, primarily from Driver classes.
+ * <p>
+ * This will display log messages in the following format:<br/>
+ * <pre>date | loggerName | methodName | level | message
+ * exception traceback (if exists)</pre>
+ * <p>
+ * The 
+ * 
+ * @author Jeremy McCormick <[log in to unmask]>
+ *
+ */
+public class DefaultLogFormatter extends Formatter {
+    
+    String separator = " | ";
+    
+    public DefaultLogFormatter() {        
+    }
+    
+    public DefaultLogFormatter(String seperator) {
+        this.separator = seperator;
+    }
+    
     public String format(LogRecord record) {
         StringBuilder sb = new StringBuilder();
-        sb.append(new Date(record.getMillis()) + " :: " +
-                record.getLoggerName() + " :: " + 
-                record .getLevel() + " :: " +
+        
+        // Append the message.
+        sb.append(new Date(record.getMillis()) + separator +
+                record.getLoggerName() + separator + 
+                record.getSourceMethodName() + separator + 
+                record.getLevel() + separator +
                 record.getMessage() + '\n');
+        
+        // Append trace back if applicable.
+        if (record.getThrown() != null) {
+            try {
+                StringWriter sw = new StringWriter();
+                PrintWriter pw = new PrintWriter(sw);
+                record.getThrown().printStackTrace(pw);
+                pw.close();
+                sb.append(sw.toString());
+            } catch (Exception ex) {
+            }
+        }        
         return sb.toString();
     }    
 }

Modified: projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/LogUtil.java
 =============================================================================
--- projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/LogUtil.java	(original)
+++ projects/lcsim/trunk/util/src/main/java/org/lcsim/util/log/LogUtil.java	Mon Feb  9 19:09:09 2015
@@ -14,30 +14,26 @@
     private LogUtil() {        
     }
 
-    public static Logger create(String name, Formatter formatter) {
+    static Logger create(String name, Formatter formatter, Level defaultLevel) {
         Logger logger = Logger.getLogger(name);
         logger.setUseParentHandlers(false);
-        logger.setLevel(Level.ALL);
+        logger.setLevel(defaultLevel);
         ConsoleHandler handler = new ConsoleHandler();
-        handler.setLevel(Level.ALL);
+        handler.setLevel(defaultLevel);
         if (formatter == null) {
-            handler.setFormatter(new DefaultFormatter());
+            handler.setFormatter(new DefaultLogFormatter());
         } else {
             handler.setFormatter(formatter);
         }
-        logger.addHandler(handler);      
+        logger.addHandler(handler);
         return logger;
     }      
-    
-    public static Logger create(String name) {
-        return create(name, null);
+        
+    public static Logger create(Class<?> klass, Formatter formatter) {
+        return create(klass.getSimpleName(), formatter, Level.ALL);
     }
-    
-    public static Logger create(Class<?> klass, Formatter formatter) { 
-        return create(klass.getSimpleName(), formatter);
-    }
-    
+        
     public static Logger create(Class<?> klass) {
         return create(klass, null);
-    }
+    }      
 }

########################################################################
Use REPLY-ALL to reply to list

To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1