[teiid-commits] teiid SVN: r1269 - in trunk: client/src/main/java/org/teiid/adminapi and 3 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Mon Aug 24 16:39:43 EDT 2009
Author: rareddy
Date: 2009-08-24 16:39:42 -0400 (Mon, 24 Aug 2009)
New Revision: 1269
Modified:
trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConfiguration.java
trunk/client/src/main/java/org/teiid/adminapi/EmbeddedLogger.java
trunk/client/src/main/java/org/teiid/adminapi/LogConfiguration.java
trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfiguration.java
trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfigurationImpl.java
trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPLogListener.java
trunk/runtime/src/main/java/com/metamatrix/jdbc/Log4JUtil.java
trunk/runtime/src/main/java/com/metamatrix/jdbc/LogConfigurationProvider.java
Log:
TEIID-672, TEIID-697: There were conflicting ways to define the Logging Levels in the Admin API, one defined by EmbeddedLogger and second by the LogConfiguration. Log4J can return a logging level as NULL, in that case take the parent logger's log level.
Modified: trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConfiguration.java
===================================================================
--- trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConfiguration.java 2009-08-21 19:44:27 UTC (rev 1268)
+++ trunk/client/src/main/java/com/metamatrix/admin/objects/MMLogConfiguration.java 2009-08-24 20:39:42 UTC (rev 1269)
@@ -32,7 +32,7 @@
/**
* @since 4.3
*/
-public class MMLogConfiguration extends MMAdminObject implements LogConfiguration {
+public class MMLogConfiguration implements LogConfiguration {
private static final long serialVersionUID = -4585962928702271706L;
Map<String, Integer> contextMap = null;
@@ -56,7 +56,6 @@
this.contextMap.put(context, logLevel);
}
-
@Override
public String toString() {
return null;
Modified: trunk/client/src/main/java/org/teiid/adminapi/EmbeddedLogger.java
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/EmbeddedLogger.java 2009-08-21 19:44:27 UTC (rev 1268)
+++ trunk/client/src/main/java/org/teiid/adminapi/EmbeddedLogger.java 2009-08-24 20:39:42 UTC (rev 1269)
@@ -31,45 +31,6 @@
public interface EmbeddedLogger {
/**
- * Message level value that specifies that no messages are to be recorded.
- */
- public static final int NONE = 0;
-
- /**
- * Message level value that specifies that critical messages are to be recorded.
- */
- public static final int CRITICAL = 1;
-
- /**
- * Message level value that specifies that error messages and critical
- * messages are to be recorded.
- */
- public static final int ERROR = 2;
-
- /**
- * Message level value that specifies that warning, error and critical
- * messages are to be recorded.
- */
- public static final int WARNING = 3;
-
- /**
- * Message level value that specifies that information, warning, error and critical
- * messages are to be recorded.
- */
- public static final int INFO = 4;
-
- /**
- * Message level value that specifies that detailed, information, warning, error and critical
- * messages are to be recorded.
- */
- public static final int DETAIL = 5;
-
- /**
- * Message level value that specifies that all messages are to be recorded.
- */
- public static final int TRACE = 6;
-
- /**
* Logs the given message if the current logging level is >= the logLevel parameter.
* @param logLevel logging level for this message
* @param timestamp timestamp at which this log message was generated
Modified: trunk/client/src/main/java/org/teiid/adminapi/LogConfiguration.java
===================================================================
--- trunk/client/src/main/java/org/teiid/adminapi/LogConfiguration.java 2009-08-21 19:44:27 UTC (rev 1268)
+++ trunk/client/src/main/java/org/teiid/adminapi/LogConfiguration.java 2009-08-24 20:39:42 UTC (rev 1269)
@@ -36,7 +36,7 @@
*
* @since 4.3
*/
-public interface LogConfiguration extends AdminObject {
+public interface LogConfiguration {
/**
* Message level value that specifies that no messages are to be recorded.
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfiguration.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfiguration.java 2009-08-21 19:44:27 UTC (rev 1268)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfiguration.java 2009-08-24 20:39:42 UTC (rev 1269)
@@ -25,7 +25,8 @@
import java.util.Set;
public interface LogConfiguration {
-
+ public static final String ROOT_CONTEXT = "org.teiid."; //$NON-NLS-1$
+
/**
* Get the current configured Log Level for supplied context
* @param context
Modified: trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfigurationImpl.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfigurationImpl.java 2009-08-21 19:44:27 UTC (rev 1268)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfigurationImpl.java 2009-08-24 20:39:42 UTC (rev 1269)
@@ -31,6 +31,8 @@
public class LogConfigurationImpl implements LogConfiguration, Serializable {
+ private static final long serialVersionUID = 4626429149431532292L;
+
Map<String, Integer> contextMap = null;
public LogConfigurationImpl() {
@@ -48,6 +50,7 @@
@Override
public int getLogLevel(String context) {
+ context = fixContext(context);
Integer level = this.contextMap.get(context);
if (level != null) {
return level;
@@ -55,6 +58,13 @@
return MessageLevel.NONE;
}
+ private String fixContext(String context) {
+ if (context.indexOf('.') == -1) {
+ context = ROOT_CONTEXT+context;
+ }
+ return context;
+ }
+
@Override
public void setLogLevel(String context, int logLevel) {
this.contextMap.put(context, logLevel);
Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPLogListener.java
===================================================================
--- trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPLogListener.java 2009-08-21 19:44:27 UTC (rev 1268)
+++ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/admin/DQPLogListener.java 2009-08-24 20:39:42 UTC (rev 1269)
@@ -23,6 +23,7 @@
package com.metamatrix.dqp.embedded.admin;
import org.teiid.adminapi.EmbeddedLogger;
+import org.teiid.adminapi.LogConfiguration;
import com.metamatrix.core.log.LogListener;
import com.metamatrix.core.log.MessageLevel;
@@ -45,27 +46,27 @@
}
private int convertLevel(int level) {
- int logLevel = EmbeddedLogger.INFO;
+ int logLevel = LogConfiguration.INFO;
switch(level) {
case MessageLevel.WARNING:
- logLevel = EmbeddedLogger.WARNING;
+ logLevel = LogConfiguration.WARNING;
break;
case MessageLevel.ERROR:
- logLevel = EmbeddedLogger.ERROR;
+ logLevel = LogConfiguration.ERROR;
break;
case MessageLevel.DETAIL:
- logLevel = EmbeddedLogger.DETAIL;
+ logLevel = LogConfiguration.DETAIL;
break;
case MessageLevel.TRACE:
- logLevel = EmbeddedLogger.TRACE;
+ logLevel = LogConfiguration.TRACE;
break;
case MessageLevel.NONE:
- logLevel = EmbeddedLogger.NONE;
+ logLevel = LogConfiguration.NONE;
break;
default:
- logLevel = EmbeddedLogger.INFO;
+ logLevel = LogConfiguration.INFO;
}
return logLevel;
}
Modified: trunk/runtime/src/main/java/com/metamatrix/jdbc/Log4JUtil.java
===================================================================
--- trunk/runtime/src/main/java/com/metamatrix/jdbc/Log4JUtil.java 2009-08-21 19:44:27 UTC (rev 1268)
+++ trunk/runtime/src/main/java/com/metamatrix/jdbc/Log4JUtil.java 2009-08-24 20:39:42 UTC (rev 1269)
@@ -27,10 +27,11 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import com.metamatrix.common.log.LogConfiguration;
import com.metamatrix.core.log.MessageLevel;
class Log4JUtil {
- private static final String ROOT_CONTEXT = "org.teiid."; //$NON-NLS-1$
+ private static final String ROOT_CONTEXT = LogConfiguration.ROOT_CONTEXT;
/**
* Convert {@link MessageLevel} to {@link Level}
Modified: trunk/runtime/src/main/java/com/metamatrix/jdbc/LogConfigurationProvider.java
===================================================================
--- trunk/runtime/src/main/java/com/metamatrix/jdbc/LogConfigurationProvider.java 2009-08-21 19:44:27 UTC (rev 1268)
+++ trunk/runtime/src/main/java/com/metamatrix/jdbc/LogConfigurationProvider.java 2009-08-24 20:39:42 UTC (rev 1269)
@@ -49,7 +49,17 @@
@Override
public int getLogLevel(String context) {
Logger log = Log4JUtil.getLogger(context);
- return Log4JUtil.convert2MessageLevel(log.getLevel());
+ Level level = log.getLevel();
+ while (level == null) {
+ log = (Logger)log.getParent();
+ if (log != null) {
+ level = log.getLevel();
+ }
+ else {
+ level = Level.ERROR;
+ }
+ }
+ return Log4JUtil.convert2MessageLevel(level);
}
@Override
More information about the teiid-commits
mailing list