|
From: <ger...@us...> - 2012-08-21 20:17:53
|
Revision: 6655
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6655&view=rev
Author: gerdwagner
Date: 2012-08-21 20:17:46 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
Fixed bug in logging: Log level could not be set in log4j.properties file.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/SquirrelLoggerFactory.java
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/Log4jLogger.java
trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/LoggerController.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/SquirrelLoggerFactory.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/SquirrelLoggerFactory.java 2012-08-11 20:44:45 UTC (rev 6654)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/SquirrelLoggerFactory.java 2012-08-21 20:17:46 UTC (rev 6655)
@@ -21,6 +21,7 @@
import java.text.DateFormat;
import java.util.Calendar;
import java.util.Date;
+import java.util.Properties;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.Log4jLoggerFactory;
@@ -64,13 +65,22 @@
}
else
{
- Logger.getRootLogger().removeAllAppenders();
- BasicConfigurator.configure(fa);
- final ILogger log = createLogger(getClass());
- if (log.isInfoEnabled()) {
- log.info("No logger configuration file passed on command line arguments. Using default log file: "
- + fa.getFile());
- }
+ Properties props = new Properties();
+ props.setProperty("log4j.rootLogger", "debug, SquirrelAppender");
+ props.setProperty("log4j.appender.SquirrelAppender", "net.sourceforge.squirrel_sql.client.SquirrelFileSizeRollingAppender");
+ props.setProperty("log4j.appender.SquirrelAppender.layout", "org.apache.log4j.PatternLayout");
+ props.setProperty("log4j.appender.SquirrelAppender.layout.ConversionPattern", "%d{ISO8601} [%t] %-5p %c %x - %m%n");
+
+ PropertyConfigurator.configure(props);
+
+
+// Logger.getRootLogger().removeAllAppenders();
+// BasicConfigurator.configure(fa);
+// final ILogger log = createLogger(getClass());
+// if (log.isInfoEnabled()) {
+// log.info("No logger configuration file passed on command line arguments. Using default log file: "
+// + fa.getFile());
+// }
}
if (doStartupLogging)
{
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2012-08-11 20:44:45 UTC (rev 6654)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2012-08-21 20:17:46 UTC (rev 6655)
@@ -3,6 +3,11 @@
${squirrelsql.changelog.header}
+Not yet released, available in our Subversion repository and in future snapshots and releases.
+===============================================================================================
+
+Fixed bug in logging: Log level could not be set in log4j.properties file.
+
2759952 (Update fails unless run as admin on Vista): Fixed mis-spelled variable in squirrel-sql.bat which
caused the application updater to fail to work properly with Windows when UAC is enabled. Thanks to user
dandar3 for the tip.
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/Log4jLogger.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/Log4jLogger.java 2012-08-11 20:44:45 UTC (rev 6654)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/Log4jLogger.java 2012-08-21 20:17:46 UTC (rev 6655)
@@ -54,7 +54,7 @@
_listener = listener;
_clazz = clazz;
_log = Logger.getLogger(clazz);
- _log.setLevel(Level.INFO);
+ //_log.setLevel(Level.INFO);
}
/**
Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/LoggerController.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/LoggerController.java 2012-08-11 20:44:45 UTC (rev 6654)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/util/log/LoggerController.java 2012-08-21 20:17:46 UTC (rev 6655)
@@ -25,11 +25,8 @@
{
private static Vector<ILoggerFactory> s_oldfactories = new Vector<ILoggerFactory>();
private static ILoggerFactory s_factory = new Log4jLoggerFactory();
-
- /** Whether or not to override the level configured in the properties file */
- private static boolean forceDebug = false;
- public static void registerLoggerFactory(ILoggerFactory factory)
+ public static void registerLoggerFactory(ILoggerFactory factory)
{
s_oldfactories.add(s_factory);
s_factory = factory != null ? factory : new Log4jLoggerFactory();
@@ -37,11 +34,7 @@
public static ILogger createLogger(Class<?> clazz)
{
- ILogger result = s_factory.createLogger(clazz);
- if (forceDebug) {
- result.setLevel(Level.DEBUG);
- }
- return result;
+ return s_factory.createLogger(clazz);
}
public static void shutdown()
@@ -72,20 +65,4 @@
}
- /**
- * @param forceDebug the forceDebug to set
- */
- public static void setForceDebug(boolean forceDebug)
- {
- LoggerController.forceDebug = forceDebug;
- }
-
- /**
- * @return the forceDebug
- */
- public static boolean isForceDebug()
- {
- return forceDebug;
- }
-
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
