[esb-java-dev] svn commit r725 - in esb/java/trunk/modules:
core/src/main/java/org/wso2/esb
core/src/main/java/org/wso2/esb/services distribution/src/main/conf
distribution/src/main/www/extensions/core/xslt
svn at wso2.com
svn at wso2.com
Mon Feb 5 03:02:45 PST 2007
Author: indika
Date: Mon Feb 5 03:02:32 2007
New Revision: 725
Modified:
esb/java/trunk/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
esb/java/trunk/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java
esb/java/trunk/modules/distribution/src/main/conf/log4j.properties
esb/java/trunk/modules/distribution/src/main/www/extensions/core/xslt/veiwtracelogs.xsl
Log:
improve logging
Modified: esb/java/trunk/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
==============================================================================
--- esb/java/trunk/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java (original)
+++ esb/java/trunk/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java Mon Feb 5 03:02:32 2007
@@ -24,15 +24,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.derby.drda.NetworkServerControl;
-import org.apache.log4j.Appender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
import org.wso2.adminui.UIProcessingException;
import org.wso2.adminui.UIProcessor;
-import org.wso2.tracer.TracerConstants;
-import org.wso2.utils.CircularBuffer;
-import org.wso2.utils.MemoryAppender;
import org.wso2.wsas.ServerConstants;
import org.wso2.wsas.util.JettyWebConfiguration;
import org.wso2.wsas.util.XmlConfigurationFactory;
@@ -57,8 +50,6 @@
public ConfigurationContext configurationContext;
- private static Logger rootLogger = Logger.getRootLogger();
-
private NetworkServerControl networkServerControl ;
public ServiceBusManager() {
@@ -149,17 +140,7 @@
// Create the index.html page and save it in the ConfigContext
generateWelcomePage();
- initLoggers();
-
- configurationContext.setProperty(
- Constants.Logging.ESB_MEMORY_APPENDER,
- rootLogger.getAppender(
- Constants.Logging.ESB_MEMORY_APPENDER));
- configureMessageMonitoring();
- }
- private void configureMessageMonitoring() {
- configurationContext.setProperty(TracerConstants.IS_TRACING, Boolean.FALSE);
}
private void generateWelcomePage() {
@@ -175,32 +156,6 @@
configurationContext.setProperty(ServerConstants.GENERATED_PAGES, fileContents);
}
- //Initializing Logger Programatically, if changed we can serialize this to
- // log4j.properties file
-
- private void initLoggers() {
- //TODO This is a temporary code that will only used to get the
- // TODO Logger section moving. Will write the proper code soon.
- MemoryAppender memoryAppender = new MemoryAppender();
- memoryAppender.setName(Constants.Logging.ESB_MEMORY_APPENDER);
- memoryAppender.setLayout(new PatternLayout("%5p [%d] [%t] %C{1} - %m%n"));
- rootLogger.addAppender(memoryAppender);
- memoryAppender.setCircularBuffer(new CircularBuffer(200));
- initLogPattern(memoryAppender);
- memoryAppender.activateOptions();
-
-
- }
-
- private void initLogPattern(Appender appender) {
- String logPatternValue;
- Layout layout = appender.getLayout();
- if (!(layout instanceof PatternLayout)) {
- logPatternValue = "%5p [%d] %x %c - %m%n";
- appender.setLayout(new PatternLayout(logPatternValue));
- }
-
- }
private void initListenerManager() {
ListenerManager listenerManager = new ListenerManager();
Modified: esb/java/trunk/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java
==============================================================================
--- esb/java/trunk/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java (original)
+++ esb/java/trunk/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java Mon Feb 5 03:02:32 2007
@@ -120,8 +120,7 @@
int DEFAULT_NO_OF_LOGS = 100;
String DEFAULT_LOGGING_PATTERN = "%5p [%d] [%t] %C{1} - %m%n";
- MemoryAppender memoryAppender = (MemoryAppender) getConfigContext()
- .getProperty(Constants.Logging.ESB_MEMORY_APPENDER);
+ MemoryAppender memoryAppender = (MemoryAppender) Logger.getRootLogger().getAppender("LOG_MEMORYAPPENDER") ;
if ((memoryAppender == null) ||
(memoryAppender.getCircularQueue() == null) ||
(memoryAppender.getCircularQueue().getObjects(amount) ==
Modified: esb/java/trunk/modules/distribution/src/main/conf/log4j.properties
==============================================================================
--- esb/java/trunk/modules/distribution/src/main/conf/log4j.properties (original)
+++ esb/java/trunk/modules/distribution/src/main/conf/log4j.properties Mon Feb 5 03:02:32 2007
@@ -14,7 +14,7 @@
# limitations under the License.
#
-log4j.rootCategory=ERROR,logfile,stdout
+log4j.rootCategory=ERROR,logfile,stdout,LOG_MEMORYAPPENDER
# Trace Logger and appender which writes to a jabber
#log4j.logger.TRACE_LOGGER = TRACE,TRACE_APPENDER
@@ -51,6 +51,12 @@
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%5p [%d] %x %c{1} - %m%n
+# The memory appender for logging
+log4j.appender.LOG_MEMORYAPPENDER=org.wso2.utils.MemoryAppender
+log4j.appender.LOG_MEMORYAPPENDER.bufferSize=200
+log4j.appender.LOG_MEMORYAPPENDER.Append=true
+log4j.appender.LOG_MEMORYAPPENDER.layout=org.apache.log4j.PatternLayout
+log4j.appender.LOG_MEMORYAPPENDER.layout.ConversionPattern=%5p [%d] %x %c{1} - %m%n
#### appender writes to a file
log4j.appender.logfile=org.apache.log4j.RollingFileAppender
log4j.appender.logfile.File=logs/wso2-esb.log
Modified: esb/java/trunk/modules/distribution/src/main/www/extensions/core/xslt/veiwtracelogs.xsl
==============================================================================
--- esb/java/trunk/modules/distribution/src/main/www/extensions/core/xslt/veiwtracelogs.xsl (original)
+++ esb/java/trunk/modules/distribution/src/main/www/extensions/core/xslt/veiwtracelogs.xsl Mon Feb 5 03:02:32 2007
@@ -26,18 +26,20 @@
<legend>Trace Log</legend>
<xsl:choose>
<xsl:when test="count(//return)!=0">
- <div class="trace"><table width="70%">
- <tbody>
- <xsl:call-template name="print-row">
- <xsl:with-param name="value">
- <xsl:value-of select="count(//return)"/>
- </xsl:with-param>
- <xsl:with-param name="limit">
- <xsl:value-of select="count(//return)"/>
- </xsl:with-param>
- </xsl:call-template>
- </tbody>
- </table></div>
+ <div class="trace">
+ <table width="70%">
+ <tbody>
+ <xsl:call-template name="print-row">
+ <xsl:with-param name="value">
+ <xsl:value-of select="count(//return)"/>
+ </xsl:with-param>
+ <xsl:with-param name="limit">
+ <xsl:value-of select="count(//return)"/>
+ </xsl:with-param>
+ </xsl:call-template>
+ </tbody>
+ </table>
+ </div>
</xsl:when>
<xsl:otherwise>
<br/>
More information about the Esb-java-dev
mailing list