[jboss-cvs] JBossAS SVN: r90433 - in branches/dml-log-service-integration: main/src/resources and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-06-18 11:43:24 -0400 (Thu, 18 Jun 2009)
New Revision: 90433

Modified:
   branches/dml-log-service-integration/main/src/main/org/jboss/Main.java
   branches/dml-log-service-integration/main/src/resources/logging.properties
   branches/dml-log-service-integration/system/src/resources/logging.properties
Log:
Logging config props; a temp hack to let property expansion work (sort of) for logging.properties until ALR finishes the bootstrap work

Modified: branches/dml-log-service-integration/main/src/main/org/jboss/Main.java
===================================================================
--- branches/dml-log-service-integration/main/src/main/org/jboss/Main.java	2009-06-18 14:37:40 UTC (rev 90432)
+++ branches/dml-log-service-integration/main/src/main/org/jboss/Main.java	2009-06-18 15:43:24 UTC (rev 90433)
@@ -117,17 +117,6 @@
       // First process the command line to pickup custom props/settings
       processCommandLine(args);
 
-      // Initialize the JDK logmanager
-      String name = System.getProperty("java.util.logging.manager");
-      if (name == null) {
-         System.setProperty("java.util.logging.manager",
-            "org.jboss.logmanager.LogManager");
-         String pluginClass = System.getProperty("org.jboss.logging.Logger.pluginClass");
-         if (pluginClass == null) {
-            System.setProperty("org.jboss.logging.Logger.pluginClass", "org.jboss.logging.logmanager.LoggerPluginImpl");
-         }
-      }
-
       // Auto set HOME_DIR to ../bin/run.jar if not set
       String homeDir = props.getProperty(ServerConfig.HOME_DIR);
       if (homeDir == null)
@@ -144,6 +133,29 @@
       }
       props.setProperty(ServerConfig.HOME_DIR, homeDir);
 
+      // XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX
+      // THIS WILL BE REPLACED WITH THE BOOTSTRAP REWORK, JUST TEMP TO MAKE LOGGING WORK UNTIL THEN
+      // Set up the boot log directory
+      String serverName = props.getProperty(ServerConfig.SERVER_NAME, "default");
+      String logDir = props.getProperty("jboss.boot.server.log.dir");
+      if (logDir == null) {
+         logDir = homeDir + "/server/" + serverName + "/log";
+      }
+      props.setProperty("jboss.boot.server.log.dir", logDir);
+      System.setProperty("jboss.boot.server.log.dir", logDir); // especially hacky
+      // XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX
+
+      // Initialize the JDK logmanager
+      String name = System.getProperty("java.util.logging.manager");
+      if (name == null) {
+         System.setProperty("java.util.logging.manager",
+            "org.jboss.logmanager.LogManager");
+         String pluginClass = System.getProperty("org.jboss.logging.Logger.pluginClass");
+         if (pluginClass == null) {
+            System.setProperty("org.jboss.logging.Logger.pluginClass", "org.jboss.logging.logmanager.LoggerPluginImpl");
+         }
+      }
+
       // Setup HOME_URL too, ServerLoader needs this
       String homeURL = props.getProperty(ServerConfig.HOME_URL);
       if (homeURL == null)

Modified: branches/dml-log-service-integration/main/src/resources/logging.properties
===================================================================
--- branches/dml-log-service-integration/main/src/resources/logging.properties	2009-06-18 14:37:40 UTC (rev 90432)
+++ branches/dml-log-service-integration/main/src/resources/logging.properties	2009-06-18 15:43:24 UTC (rev 90433)
@@ -22,24 +22,24 @@
 
 ### $Id: $ ###
 
-# Logger names to configure (root logger is always configured)
-loggers=
+# Additional logger names to configure (root logger is always configured)
+#loggers=org.jboss.whatever
 
 # Root logger level
-logger.level=DEBUG
+logger.level=${jboss.boot.server.log.level:DEBUG}
 # Root logger handlers
 logger.handlers=CONSOLE, FILE
 
 # Console handler configuration
 handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
 handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=INFO
+handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
 handler.CONSOLE.autoFlush=true
 handler.CONSOLE.formatter=PATTERN
 
 # Boot log file handler configuration
 handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=ALL
+handler.FILE.level=${jboss.boot.server.log.file.level:DEBUG}
 handler.FILE.properties=autoFlush,fileName
 handler.FILE.autoFlush=true
 handler.FILE.fileName=${jboss.boot.server.log.dir}/boot.log

Modified: branches/dml-log-service-integration/system/src/resources/logging.properties
===================================================================
--- branches/dml-log-service-integration/system/src/resources/logging.properties	2009-06-18 14:37:40 UTC (rev 90432)
+++ branches/dml-log-service-integration/system/src/resources/logging.properties	2009-06-18 15:43:24 UTC (rev 90433)
@@ -26,20 +26,20 @@
 #loggers=org.jboss.whatever
 
 # Root logger level
-logger.level=DEBUG
+logger.level=${jboss.boot.server.log.level:DEBUG}
 # Root logger handlers
 logger.handlers=CONSOLE, FILE
 
 # Console handler configuration
 handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
 handler.CONSOLE.properties=autoFlush
-handler.CONSOLE.level=INFO
+handler.CONSOLE.level=${jboss.boot.server.log.console.level:INFO}
 handler.CONSOLE.autoFlush=true
 handler.CONSOLE.formatter=PATTERN
 
 # Boot log file handler configuration
 handler.FILE=org.jboss.logmanager.handlers.FileHandler
-handler.FILE.level=ALL
+handler.FILE.level=${jboss.boot.server.log.file.level:DEBUG}
 handler.FILE.properties=autoFlush,fileName
 handler.FILE.autoFlush=true
 handler.FILE.fileName=${jboss.boot.server.log.dir}/boot.log