You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ar...@apache.org on 2004/12/19 03:26:05 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/broker/util/logging LoggingConfiguration.java
arminw 2004/12/18 18:26:05
Modified: src/java/org/apache/ojb/broker/util/logging Tag:
OJB_1_0_RELEASE LoggingConfiguration.java
Log:
fix, always close opened streams
Revision Changes Path
No revision
No revision
1.8.2.1 +40 -19 db-ojb/src/java/org/apache/ojb/broker/util/logging/LoggingConfiguration.java
Index: LoggingConfiguration.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/logging/LoggingConfiguration.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- LoggingConfiguration.java 23 Jun 2004 07:13:51 -0000 1.8
+++ LoggingConfiguration.java 19 Dec 2004 02:26:05 -0000 1.8.2.1
@@ -75,21 +75,27 @@
loggerClassName = getLoggerClass(System.getProperties());
_loggerConfigFile = getLoggerConfigFile(System.getProperties());
+ InputStream ojbLogPropFile = null;
if (loggerClassName == null)
{
// now we're trying to load the OJB-logging.properties file
String ojbLoggingPropFile = System.getProperty(OJB_LOGGING_PROPERTIES_FILE, OJB_LOGGING_PROPERTIES_FILE);
-
try
{
- InputStream ojbLogPropFile = contextLoader.getResourceAsStream(OJB_LOGGING_PROPERTIES_FILE);
-
+ ojbLogPropFile = contextLoader.getResourceAsStream(ojbLoggingPropFile);
if (ojbLogPropFile != null)
{
- bootLogger.debug("Found logging properties file "+OJB_LOGGING_PROPERTIES_FILE);
- properties.load(ojbLogPropFile);
- loggerClassName = getLoggerClass(properties);
- _loggerConfigFile = getLoggerConfigFile(properties);
+ try
+ {
+ bootLogger.info("Found logging properties file: "+ojbLoggingPropFile);
+ properties.load(ojbLogPropFile);
+ loggerClassName = getLoggerClass(properties);
+ _loggerConfigFile = getLoggerConfigFile(properties);
+ }
+ finally
+ {
+ ojbLogPropFile.close();
+ }
}
}
catch (Exception ex)
@@ -103,17 +109,23 @@
try
{
- InputStream ojbLogPropFile = contextLoader.getResourceAsStream(ojbPropFile);
-
+ ojbLogPropFile = contextLoader.getResourceAsStream(ojbPropFile);
if (ojbLogPropFile != null)
{
- properties.load(ojbLogPropFile);
- loggerClassName = getLoggerClass(properties);
- _loggerConfigFile = getLoggerConfigFile(properties);
- if (loggerClassName != null)
+ try
+ {
+ properties.load(ojbLogPropFile);
+ loggerClassName = getLoggerClass(properties);
+ _loggerConfigFile = getLoggerConfigFile(properties);
+ if (loggerClassName != null)
+ {
+ // deprecation warning for after 1.0
+ bootLogger.warn("Please use a separate '"+OJB_LOGGING_PROPERTIES_FILE+"' file to specify your logging settings");
+ }
+ }
+ finally
{
- // deprecation warning for after 1.0
- //bootLogger.warn("Please use a separate "+OJB_LOGGING_PROPERTIES_FILE+" file to specify your logging settings");
+ ojbLogPropFile.close();
}
}
}
@@ -124,7 +136,8 @@
{
try
{
- _loggerClass = Class.forName(loggerClassName);
+ _loggerClass = ClassHelper.getClass(loggerClassName);
+ bootLogger.info("Logging: Found logger class '" + loggerClassName);
}
catch (ClassNotFoundException ex)
{
@@ -140,17 +153,21 @@
{
// yep, so use commons-logging
_loggerClass = CommonsLoggerImpl.class;
+ bootLogger.info("Logging: Found commons logging properties, use " + _loggerClass);
}
else
{
// but perhaps there is a log4j.properties file ?
try
{
- if (contextLoader.getResourceAsStream("log4j.properties") != null)
+ ojbLogPropFile = contextLoader.getResourceAsStream("log4j.properties");
+ if (ojbLogPropFile != null)
{
// yep, so use log4j
_loggerClass = Log4jLoggerImpl.class;
_loggerConfigFile = "log4j.properties";
+ bootLogger.info("Logging: Found 'log4j.properties' file, use " + _loggerClass);
+ ojbLogPropFile.close();
}
}
catch (Exception ex)
@@ -160,16 +177,20 @@
// or a commons-logging.properties file ?
try
{
- if (contextLoader.getResourceAsStream("commons-logging.properties") != null)
+ ojbLogPropFile = contextLoader.getResourceAsStream("commons-logging.properties");
+ if (ojbLogPropFile != null)
{
// yep, so use commons-logging
_loggerClass = CommonsLoggerImpl.class;
_loggerConfigFile = "commons-logging.properties";
+ bootLogger.info("Logging: Found 'commons-logging.properties' file, use " + _loggerClass);
+ ojbLogPropFile.close();
}
}
catch (Exception ex)
{}
// no, so default to poor man's logging
+ bootLogger.info("** Can't find logging configuration file, use default logger **");
_loggerClass = PoorMansLoggerImpl.class;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org