db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r592590 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/build.xml impl/services/monitor/BaseMonitor.java
Date Wed, 07 Nov 2007 00:07:32 GMT
Author: kmarsden
Date: Tue Nov  6 16:07:31 2007
New Revision: 592590

URL: http://svn.apache.org/viewvc?rev=592590&view=rev
Log:
DERBY-1272 (partial) Log sysinfo to derby.log with derby.stream.error.logSeverityLevel=0

Does not include test at this time because of test ordering problem.
Contributed  by Andrew McIntyre, Ramin Moazeni.


Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml?rev=592590&r1=592589&r2=592590&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml Tue Nov  6 16:07:31 2007
@@ -54,7 +54,7 @@
       optimize="${optimize}"
       proceed="${proceed}"
       verbose="${verbose}"
-      srcdir="${derby.engine.src.dir}"
+      srcdir="${derby.engine.src.dir};${derby.tools.src.dir}"
       destdir="${out.dir}">
       <classpath>
         <pathelement path="${compile.classpath}"/>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java?rev=592590&r1=592589&r2=592590&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
Tue Nov  6 16:07:31 2007
@@ -1936,6 +1936,18 @@
 
 	private void dumpTempWriter(boolean bothPlaces) {
 
+                // DERBY-1272: Print sysinfo to log if derby.stream.error.logSeverityLevel=0
+                int logSeverityLevel = PropertyUtil.getSystemInt(Property.LOG_SEVERITY_LEVEL,
+                        SanityManager.DEBUG ? 0 : ExceptionSeverity.SESSION_SEVERITY);
+                if (logSeverityLevel == 0) {
+                    if (systemStreams != null) {
+                       systemStreams.stream().printlnWithHeader("");
+                       org.apache.derby.tools.sysinfo.getInfo(systemStreams.stream().getPrintWriter());
+                    } else {
+                       org.apache.derby.tools.sysinfo.getInfo(getTempWriter());
+                    }
+                }
+
 		if (tmpWriter == null)
 			return;
 



Mime
View raw message