[MMBASE SCM] r41746 - mmbase/trunk/utils/src/main/java/org/mmbase/util/logging

[michiel]

Author: michiel
Date: 2010-04-02 18:12:06 +0200 (Fri, 02 Apr 2010)
New Revision: 41746

Modified:
   mmbase/trunk/utils/src/main/java/org/mmbase/util/logging/Logging.java
Log:
subscring to the machine name event, rather then depending on someone to call 
my method

Modified: mmbase/trunk/utils/src/main/java/org/mmbase/util/logging/Logging.java
===================================================================
--- mmbase/trunk/utils/src/main/java/org/mmbase/util/logging/Logging.java       
2010-04-02 16:07:07 UTC (rev 41745)
+++ mmbase/trunk/utils/src/main/java/org/mmbase/util/logging/Logging.java       
2010-04-02 16:12:06 UTC (rev 41746)
@@ -13,6 +13,7 @@
 
 import java.util.*;
 
+import org.mmbase.core.event.*;
 import org.mmbase.util.ApplicationContextReader;
 import org.mmbase.util.ResourceWatcher;
 import org.mmbase.util.ResourceLoader;
@@ -85,7 +86,17 @@
 
     private static String machineName = "localhost";
 
+    static {
+        EventManager.getInstance().addEventListener(new SystemEventListener() {
+                public void notify(SystemEvent se) {
+                    if (se instanceof SystemEvent.MachineName) {
+                        machineName = ((SystemEvent.MachineName) se).getName();
+                    }
+                }
+            });
+    }
 
+
     private Logging() {
         // this class has no instances.
     }
@@ -97,12 +108,6 @@
     public static String getMachineName() {
         return machineName;
     }
-    /**
-     * @since MMBase-1.8
-     */
-    public static void setMachineName(String mn) {
-        machineName = mn;
-    }
 
     /**
      * @since MMBase-1.8.5

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs