[teiid-commits] teiid SVN: r483 - in trunk/server/src/main/java/com/metamatrix: server and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2009-02-23 14:51:45 -0500 (Mon, 23 Feb 2009)
New Revision: 483

Modified:
   trunk/server/src/main/java/com/metamatrix/common/log/DbLogListener.java
   trunk/server/src/main/java/com/metamatrix/server/ServerLogListernerProvider.java
Log:
TEIID-361

Modified: trunk/server/src/main/java/com/metamatrix/common/log/DbLogListener.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/common/log/DbLogListener.java	2009-02-23 19:46:08 UTC (rev 482)
+++ trunk/server/src/main/java/com/metamatrix/common/log/DbLogListener.java	2009-02-23 19:51:45 UTC (rev 483)
@@ -25,7 +25,6 @@
 import java.util.Properties;
 
 import com.metamatrix.common.CommonPlugin;
-import com.metamatrix.common.util.PropertiesUtils;
 import com.metamatrix.core.log.LogListener;
 import com.metamatrix.core.log.LogMessage;
 
@@ -34,27 +33,23 @@
  */
 public class DbLogListener implements LogListener {
 
-    public static final String LOG_DB_ENABLED = "metamatrix.log.jdbcDatabase.enabled"; //$NON-NLS-1$
-
 	private DbLogWriter writer = null;
     private boolean enabled = true;
 
 	/**
 	 * Listen for log messages and write them to a database.
 	 */
-	public DbLogListener(Properties prop){
+	public DbLogListener(Properties prop, boolean enable){
 		if (prop == null) {
 			final String msg = CommonPlugin.Util.getString("DbLogListener.The_Properties_reference_may_not_be_null");  //$NON-NLS-1$
 			throw new IllegalArgumentException(msg);
 		}
         writer = new DbLogWriter(prop);
         writer.initialize();
-        enabled = PropertiesUtils.getBooleanProperty(prop, LOG_DB_ENABLED, true);
+        this.enabled = enable;
 	}
 
-
     public void logMessage(LogMessage msg) {
-        
         if (enabled) {
             writer.logMessage(msg);
         }
@@ -63,15 +58,8 @@
 	public void shutdown() {
 		writer.shutdown();
 	}
-    
-    public void determineIfEnabled(Properties props) {
-        boolean isenabled = PropertiesUtils.getBooleanProperty(props, LOG_DB_ENABLED, true);
-        enableDBLogging(isenabled);
 
-    }
-    
-    void enableDBLogging(boolean enable) {
+    public void enableDBLogging(boolean enable) {
         enabled = enable;
     }
-
 }

Modified: trunk/server/src/main/java/com/metamatrix/server/ServerLogListernerProvider.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/ServerLogListernerProvider.java	2009-02-23 19:46:08 UTC (rev 482)
+++ trunk/server/src/main/java/com/metamatrix/server/ServerLogListernerProvider.java	2009-02-23 19:51:45 UTC (rev 483)
@@ -96,7 +96,8 @@
 	private DbLogListener buildDBLogger() {
 		Properties currentProps = CurrentConfiguration.getInstance().getProperties();
 		Properties resultsProps = PropertiesUtils.clone(currentProps, null, true, false);
-		return new DbLogListener(resultsProps);
+		boolean enabled = PropertiesUtils.getBooleanProperty(resultsProps, LOG_DB_ENABLED, true);
+		return new DbLogListener(resultsProps, enabled);
 	}
 	
 }