Return-Path: Delivered-To: apmail-geronimo-dev-archive@www.apache.org Received: (qmail 14815 invoked from network); 6 Mar 2007 21:02:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Mar 2007 21:02:27 -0000 Received: (qmail 45808 invoked by uid 500); 6 Mar 2007 21:02:34 -0000 Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org Received: (qmail 45767 invoked by uid 500); 6 Mar 2007 21:02:34 -0000 Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list dev@geronimo.apache.org Received: (qmail 45756 invoked by uid 99); 6 Mar 2007 21:02:34 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2007 13:02:34 -0800 X-ASF-Spam-Status: No, hits=0.8 required=10.0 tests=INFO_TLD,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: domain of jason.dillon@gmail.com designates 66.249.82.238 as permitted sender) Received: from [66.249.82.238] (HELO wx-out-0506.google.com) (66.249.82.238) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2007 13:02:22 -0800 Received: by wx-out-0506.google.com with SMTP id s18so170316wxc for ; Tue, 06 Mar 2007 13:02:01 -0800 (PST) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:mime-version:in-reply-to:references:content-type:message-id:content-transfer-encoding:from:subject:date:to:x-mailer:sender; b=L08FsZvDMszHoeHzMAAUl1mZnWszi2upgjP0PGWQGiZMfq3lqSH5ZmSGYWxizWIoXtwVT4Sx39RYbtImjvouv6YzxpzAPeqv/9ofUOplKxxbvToG1af9Cuw1nNd9H/vl7OSuq1XpP0tjbtEDxJFTp+laE9KomYZQLjNmTAsyJAY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:mime-version:in-reply-to:references:content-type:message-id:content-transfer-encoding:from:subject:date:to:x-mailer:sender; b=lpJOx3pEy3XX/L/ByOlRqCfk0vt/Oc8l0VAk36+Eoz9hDRS8hJjtr+n7nxsJ33fukN7BDyCKbXMfTK849vmsPg44FNisFVo4FsoR+KsZF67GgodMZlLH8RK7xAPbrhj2tJpuIjw2OLiqgO9wTlw4p0RbRRmdXQg7LRAP3ewvJzA= Received: by 10.70.37.12 with SMTP id k12mr8857686wxk.1173214921557; Tue, 06 Mar 2007 13:02:01 -0800 (PST) Received: from ?10.0.1.2? ( [24.7.69.241]) by mx.google.com with ESMTP id i37sm11076353wxd.2007.03.06.13.01.59; Tue, 06 Mar 2007 13:02:00 -0800 (PST) Mime-Version: 1.0 (Apple Message framework v752.3) In-Reply-To: <74A47902-E76F-4071-A798-8EBF755FA7E6@gmail.com> References: <20070228233839.B85921A981A@eris.apache.org> <74A47902-E76F-4071-A798-8EBF755FA7E6@gmail.com> Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Message-Id: <51B0F6D3-F0D8-4C9D-86E8-95EFFD2DDBD3@planet57.com> Content-Transfer-Encoding: 7bit From: Jason Dillon Subject: Re: svn commit: r513066 - in /geronimo/server/trunk/modules: geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/ geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ geronimo-system/src/main/java/org/apache/geronimo/system/main/ Date: Tue, 6 Mar 2007 13:02:00 -0800 To: dev@geronimo.apache.org X-Mailer: Apple Mail (2.752.3) Sender: Jason Dillon X-Virus-Checked: Checked by ClamAV on apache.org Ya, this should go to 1.2... will have a peek at it later today. --jason On Mar 5, 2007, at 10:06 PM, Kevan Miller wrote: > Jason, > Thoughts on getting this into 1.2 (or at least part)? In > particular, stop printing the environment information to STDOUT > during startup... > > --kevan > On Feb 28, 2007, at 6:38 PM, jdillon@apache.org wrote: > >> Author: jdillon >> Date: Wed Feb 28 15:38:38 2007 >> New Revision: 513066 >> >> URL: http://svn.apache.org/viewvc?view=rev&rev=513066 >> Log: >> (GERONIMO-2741) Clean up logging output on console >> >> Modified: >> geronimo/server/trunk/modules/geronimo-kernel/src/main/java/ >> org/apache/geronimo/kernel/log/GeronimoLogging.java >> geronimo/server/trunk/modules/geronimo-system/src/main/java/ >> org/apache/geronimo/system/logging/log4j/Log4jService.java >> geronimo/server/trunk/modules/geronimo-system/src/main/java/ >> org/apache/geronimo/system/main/Daemon.java >> >> Modified: geronimo/server/trunk/modules/geronimo-kernel/src/main/ >> java/org/apache/geronimo/kernel/log/GeronimoLogging.java >> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ >> geronimo-kernel/src/main/java/org/apache/geronimo/kernel/log/ >> GeronimoLogging.java?view=diff&rev=513066&r1=513065&r2=513066 >> ===================================================================== >> ========= >> --- geronimo/server/trunk/modules/geronimo-kernel/src/main/java/ >> org/apache/geronimo/kernel/log/GeronimoLogging.java (original) >> +++ geronimo/server/trunk/modules/geronimo-kernel/src/main/java/ >> org/apache/geronimo/kernel/log/GeronimoLogging.java Wed Feb 28 >> 15:38:38 2007 >> @@ -55,7 +55,12 @@ >> >> // force the log factory to initialize >> LogFactory.getLog(GeronimoLogging.class); >> - >> + >> + // >> + // FIXME: Replace the bits below with this: >> + // >> + // System.setProperty("mx4j.log.prototype", >> "mx4j.log.CommonsLogger"); >> + >> // force mx4j to use commons logging >> // Use reflection so mx4j is not required (this is >> important in JDK 1.5) >> // mx4j.log.Log.redirectTo(new mx4j.log.CommonsLogger >> ()); >> >> Modified: geronimo/server/trunk/modules/geronimo-system/src/main/ >> java/org/apache/geronimo/system/logging/log4j/Log4jService.java >> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ >> geronimo-system/src/main/java/org/apache/geronimo/system/logging/ >> log4j/Log4jService.java?view=diff&rev=513066&r1=513065&r2=513066 >> ===================================================================== >> ========= >> --- geronimo/server/trunk/modules/geronimo-system/src/main/java/ >> org/apache/geronimo/system/logging/log4j/Log4jService.java (original) >> +++ geronimo/server/trunk/modules/geronimo-system/src/main/java/ >> org/apache/geronimo/system/logging/log4j/Log4jService.java Wed Feb >> 28 15:38:38 2007 >> @@ -512,6 +512,8 @@ >> File file = resolveConfigurationFile(); >> if (file == null || !file.exists()) { >> return; >> + } else { >> + lastChanged = file.lastModified(); >> } >> >> // Record the default console log level >> @@ -552,23 +554,8 @@ >> public void doStart() { >> LogFactory logFactory = LogFactory.getFactory(); >> if (logFactory instanceof GeronimoLogFactory) { >> - synchronized (this) { >> - timer = new Timer(true); >> - >> - // Periodically check the configuration file >> - schedule(); >> - >> - // Make sure the root Logger has loaded >> - Logger logger = LogManager.getRootLogger(); >> - >> - reconfigure(); >> - >> - File file = resolveConfigurationFile(); >> - if (file != null) { >> - lastChanged = file.lastModified(); >> - } >> - logEnvInfo(logger); >> - } >> + // Make sure the root Logger has loaded >> + Logger logger = LogManager.getRootLogger(); >> >> // Change all of the loggers over to use log4j >> GeronimoLogFactory geronimoLogFactory = >> (GeronimoLogFactory) logFactory; >> @@ -577,6 +564,17 @@ >> geronimoLogFactory.setLogFactory(new >> CachingLog4jLogFactory()); >> } >> } >> + >> + synchronized (this) { >> + reconfigure(); >> + >> + timer = new Timer(true); >> + >> + // Periodically check the configuration file >> + schedule(); >> + } >> + >> + logEnvInfo(); >> } >> >> synchronized (this) { >> @@ -608,8 +606,9 @@ >> } >> } >> >> - private void logEnvInfo(Logger log) { >> + private void logEnvInfo() { >> try { >> + Log log = LogFactory.getLog(Log4jService.class); >> log.info >> ("----------------------------------------------"); >> log.info("Started Logging Service"); >> log.debug("Log4jService created with configFileName=" + >> this.configurationFile + >> @@ -640,9 +639,7 @@ >> log.info(" System property [sun.boot.class.path] = " + >> System.getProperty("sun.boot.class.path")); >> log.info >> ("----------------------------------------------"); >> } catch (Exception e) { >> - String msg = "Exception caught during logging of >> Runtime Information. Exception=" + e.toString(); >> - log.error(msg); >> - System.err.println(msg); >> + System.err.println("Exception caught during logging of >> Runtime Information. Exception=" + e.toString()); >> } >> } >> >> >> Modified: geronimo/server/trunk/modules/geronimo-system/src/main/ >> java/org/apache/geronimo/system/main/Daemon.java >> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ >> geronimo-system/src/main/java/org/apache/geronimo/system/main/ >> Daemon.java?view=diff&rev=513066&r1=513065&r2=513066 >> ===================================================================== >> ========= >> --- geronimo/server/trunk/modules/geronimo-system/src/main/java/ >> org/apache/geronimo/system/main/Daemon.java (original) >> +++ geronimo/server/trunk/modules/geronimo-system/src/main/java/ >> org/apache/geronimo/system/main/Daemon.java Wed Feb 28 15:38:38 2007 >> @@ -160,27 +160,43 @@ >> >> // Perform initialization tasks common with the >> various Geronimo environments >> GeronimoEnvironment.init(); >> - >> - // This MUST be done before the first log is acquired >> (WHICH THE STARTUP MONITOR 5 LINES LATER DOES!) >> + >> + // >> + // FIXME: Allow -v -> INFO, -vv -> DEBUG, -vvv -> TRACE >> + // >> + >> + // This MUST be done before the first log is acquired >> (which the startup monitor below does) >> // Generally we want to suppress anything but WARN >> until the log GBean starts up >> - GeronimoLogging.initialize(verboseArg == null || >> verboseArg.equals(ARGUMENT_VERBOSE) ? GeronimoLogging.WARN : >> GeronimoLogging.DEBUG); >> - // The following will be used once the log GBean >> starts up >> - GeronimoLogging.setConsoleLogLevel(verboseArg == >> null ? GeronimoLogging.INFO : verboseArg.equals >> (ARGUMENT_VERBOSE) ? GeronimoLogging.DEBUG : GeronimoLogging.TRACE); >> + GeronimoLogging level = GeronimoLogging.WARN; >> + if (verboseArg != null) { >> + if (verboseArg.equals(ARGUMENT_VERBOSE)) { >> + level = GeronimoLogging.DEBUG; >> + } else if (verboseArg.equals >> (ARGUMENT_MORE_VERBOSE)) { >> + level = GeronimoLogging.TRACE; >> + } >> + } >> + GeronimoLogging.initialize(level); >> + >> log = LogFactory.getLog(Daemon.class.getName()); >> } >> >> if (verboseArg != null || noProgressArg != null) { >> monitor = new SilentStartupMonitor(); >> } else { >> - if (longProgressArg != null) >> + if (longProgressArg != null) { >> monitor = new LongStartupMonitor(); >> - else >> + } else { >> monitor = new ProgressBarStartupMonitor(); >> + } >> } >> >> // JVMCheck(); // Removed for 1.1 >> } >> >> + // >> + // FIXME: This is not used... >> + // >> + >> private void JVMCheck() { >> String jvmVersion = System.getProperty >> ("java.specification.version"); >> if (! jvmVersion.equals("1.4")) >> @@ -197,13 +213,11 @@ >> // since we allow it to be configured in geronimo.bat >> and geronimo.sh >> // (since 1.0 release) the same way Tomcat allows it >> to be configured. >> String tmpDir = System.getProperty("java.io.tmpdir"); >> - if (tmpDir == null || (!(new File(tmpDir)).exists()) || >> - (!(new File(tmpDir)).isDirectory())) { >> - System.err.println("The java.io.tmpdir system >> property specifies the "+ >> - "non-existent directory " +tmpDir); >> - System.exit(1); >> - throw new AssertionError(); >> - } >> + if (tmpDir == null || (!(new File(tmpDir)).exists()) >> || (!(new File(tmpDir)).isDirectory())) { >> + System.err.println("The java.io.tmpdir system >> property specifies a non-existent directory: " + tmpDir); >> + System.exit(1); >> + throw new AssertionError(); >> + } >> >> // Determine the geronimo installation directory >> File geronimoInstallDirectory = >> DirectoryUtils.getGeronimoInstallDirectory(); >> @@ -332,7 +346,11 @@ >> throw new AssertionError(); >> } >> } >> - >> + >> + // >> + // FIXME: This is not used... >> + // >> + >> private void AddToSystemProperty(String propertyName, List >> dirsFromManifest, File geronimoInstallDirectory) { >> String dirs = System.getProperty(propertyName, ""); >> for (Iterator iterator = dirsFromManifest.iterator(); >> iterator.hasNext();) { >> >> >