geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1221387 - /geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java
Date Tue, 20 Dec 2011 18:04:13 GMT
Author: djencks
Date: Tue Dec 20 18:04:13 2011
New Revision: 1221387

URL: http://svn.apache.org/viewvc?rev=1221387&view=rev
Log:
GERONIMO-6240 Don't override the original log config.  Needs more consideration

Modified:
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java

Modified: geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java?rev=1221387&r1=1221386&r2=1221387&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java
Tue Dec 20 18:04:13 2011
@@ -510,27 +510,27 @@ public abstract class Log4jService imple
      * Force the logging system to reconfigure.
      */
     public void reconfigure() {
-        File file = resolveConfigurationFile();
-        if (file == null || !file.exists()) {
-            return;
-        } else {
-            log.debug("Reconfiguring from: {}", configurationFile);
-            lastChanged = file.lastModified();
-        }
-
-        try {
-            FileInputStream in = new FileInputStream(file);
-            Properties props = new Properties();
-            try {
-                props.load(in);
-            } finally {
-                try { in.close(); } catch (IOException ignore) {}
-            }
-            
-            update(props);                        
-        } catch (Exception e) {
-            e.printStackTrace();
-        }   
+//        File file = resolveConfigurationFile();
+//        if (file == null || !file.exists()) {
+//            return;
+//        } else {
+//            log.debug("Reconfiguring from: {}", configurationFile);
+//            lastChanged = file.lastModified();
+//        }
+//
+//        try {
+//            FileInputStream in = new FileInputStream(file);
+//            Properties props = new Properties();
+//            try {
+//                props.load(in);
+//            } finally {
+//                try { in.close(); } catch (IOException ignore) {}
+//            }
+//
+//            update(props);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
     }
 
     abstract protected void update(Properties properties) throws Exception;      



Mime
View raw message