[MMBASE CVS] src/org/mmbase/util/logging Logging.java SimpleImpl.java SimpleTimeStampImpl.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/util/logging
In directory james.mmbase.org:/tmp/cvs-serv10472

Modified Files:
        Logging.java SimpleImpl.java SimpleTimeStampImpl.java 
Log Message:
  MMB-1783


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/logging
See also: http://www.mmbase.org/jira/browse/MMB-1783


Index: Logging.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/logging/Logging.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- Logging.java        18 Oct 2008 10:25:06 -0000      1.48
+++ Logging.java        4 Feb 2009 12:31:51 -0000       1.49
@@ -59,7 +59,7 @@
  * </p>
  *
  * @author Michiel Meeuwissen
- * @version $Id: Logging.java,v 1.48 2008/10/18 10:25:06 michiel Exp $
+ * @version $Id: Logging.java,v 1.49 2009/02/04 12:31:51 michiel Exp $
  */
 
 
@@ -164,7 +164,7 @@
             return;
         }
 
-        String classToUse    = SimpleImpl.class.getName(); // default
+        String classToUse    = SimpleTimeStampImpl.class.getName(); // default
         String configuration = "stderr,info";              // default
 
         Map<String, String> overrides = getInitParameters();


Index: SimpleImpl.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/logging/SimpleImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- SimpleImpl.java     2 Oct 2005 16:42:15 -0000       1.12
+++ SimpleImpl.java     4 Feb 2009 12:31:51 -0000       1.13
@@ -11,6 +11,8 @@
 
 import java.io.PrintStream;
 import java.util.StringTokenizer;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * A very simple implementation of Logger. It writes everything to
@@ -21,7 +23,7 @@
  * configure string).
  *
  * @author  Michiel Meeuwissen
- * @version $Id: SimpleImpl.java,v 1.12 2005/10/02 16:42:15 michiel Exp $
+ * @version $Id: SimpleImpl.java,v 1.13 2009/02/04 12:31:51 michiel Exp $
  * @since   MMBase-1.4
  */
 
@@ -30,12 +32,20 @@
     private static SimpleImpl root = new SimpleImpl();
     private static PrintStream ps = System.out;
 
+    private static Map<String, SimpleImpl> loggers  = new 
ConcurrentHashMap<String, SimpleImpl>();
+
     private SimpleImpl() {
-        // a Singleton class.
+
     }
 
     public static  SimpleImpl getLoggerInstance(String name) {
-        return root;
+        SimpleImpl impl = loggers.get(name);
+        if (impl == null) {
+            impl = new SimpleImpl();
+            impl.level = root.level;
+            loggers.put(name, impl);
+        }
+        return impl;
     }
 
     /**


Index: SimpleTimeStampImpl.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/logging/SimpleTimeStampImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SimpleTimeStampImpl.java    2 Oct 2005 16:42:15 -0000       1.3
+++ SimpleTimeStampImpl.java    4 Feb 2009 12:31:51 -0000       1.4
@@ -11,6 +11,8 @@
 
 import java.io.PrintStream;
 import java.util.StringTokenizer;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
@@ -18,7 +20,7 @@
  * Like SimpleImpl, but also adds timestamps.
  *
  * @author  Michiel Meeuwissen
- * @version $Id: SimpleTimeStampImpl.java,v 1.3 2005/10/02 16:42:15 michiel 
Exp $
+ * @version $Id: SimpleTimeStampImpl.java,v 1.4 2009/02/04 12:31:51 michiel 
Exp $
  * @since   MMBase-1.7
  */
 
@@ -28,14 +30,20 @@
     private static PrintStream ps = System.out;
 
     private static final DateFormat dateFormat = new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss,SSS ");
+    private static Map<String, SimpleTimeStampImpl> loggers  = new 
ConcurrentHashMap<String, SimpleTimeStampImpl>();
 
 
     private SimpleTimeStampImpl() {
-        // a Singleton class.
     }
 
     public static  SimpleTimeStampImpl getLoggerInstance(String name) {
-        return root;
+        SimpleTimeStampImpl impl = loggers.get(name);
+        if (impl == null) {
+            impl = new SimpleTimeStampImpl();
+            impl.level = root.level;
+            loggers.put(name, impl);
+        }
+        return impl;
     }
 
     /**
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs