[esb-java-dev] svn commit r705 - in
esb/java/trunk/modules/core/src/main/java/org/wso2/esb:
logging services
svn at wso2.com
svn at wso2.com
Mon Feb 5 00:10:15 PST 2007
Author: indika
Date: Mon Feb 5 00:09:58 2007
New Revision: 705
Modified:
esb/java/trunk/modules/core/src/main/java/org/wso2/esb/logging/DefaultEvaluator.java
esb/java/trunk/modules/core/src/main/java/org/wso2/esb/logging/IMAppender.java
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/ServiceAdmin.java
Log:
remove old tracer
add new tracing
Modified: esb/java/trunk/modules/core/src/main/java/org/wso2/esb/logging/DefaultEvaluator.java
==============================================================================
--- esb/java/trunk/modules/core/src/main/java/org/wso2/esb/logging/DefaultEvaluator.java (original)
+++ esb/java/trunk/modules/core/src/main/java/org/wso2/esb/logging/DefaultEvaluator.java Mon Feb 5 00:09:58 2007
@@ -27,7 +27,7 @@
*
*/
-package org.wso2.esb.tracing;
+package org.wso2.esb.logging;
import org.apache.log4j.Level;
import org.apache.log4j.spi.LoggingEvent;
Modified: esb/java/trunk/modules/core/src/main/java/org/wso2/esb/logging/IMAppender.java
==============================================================================
--- esb/java/trunk/modules/core/src/main/java/org/wso2/esb/logging/IMAppender.java (original)
+++ esb/java/trunk/modules/core/src/main/java/org/wso2/esb/logging/IMAppender.java Mon Feb 5 00:09:58 2007
@@ -28,7 +28,7 @@
*
*/
-package org.wso2.esb.tracing;
+package org.wso2.esb.logging;
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Layout;
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 00:09:58 2007
@@ -18,27 +18,17 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
+import org.apache.log4j.Appender;
import org.apache.log4j.Layout;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.spi.LoggingEvent;
import org.wso2.esb.Constants;
-import org.wso2.esb.services.utils.MessageContentData;
-import org.wso2.esb.services.utils.MessageSummaryData;
+import org.wso2.esb.ServiceBusException;
import org.wso2.esb.services.utils.ServerStatus;
import org.wso2.tracer.TracerConstants;
import org.wso2.utils.MemoryAppender;
import org.wso2.wsas.admin.service.util.ServerData;
-
-import javax.xml.transform.*;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
/*
*
*/
@@ -85,6 +75,45 @@
getAxisConfig().getRepository().getPath());
}
+ public String[] getTraceLogs(int amount) throws ServiceBusException {
+ int DEFAULT_NO_OF_LOGS = 100;
+ String DEFAULT_LOGGING_PATTERN = "[%X{ip}] [%X{host}] [%t] %-5p %C{1} - %m %n";
+ Logger logger = Logger.getLogger(org.apache.synapse.Constants.TRACE_LOGGER);
+ Appender appender = logger.getAppender("TRACE_MEMORYAPPENDER");
+ if (appender instanceof MemoryAppender) {
+
+ MemoryAppender memoryAppender = (MemoryAppender) appender;
+ if ((memoryAppender.getCircularQueue() == null) ||
+ (memoryAppender.getCircularQueue().getObjects(amount) ==
+ null) ||
+ (memoryAppender.getCircularQueue().getObjects(amount)
+ .length == 0)) {
+ return new String[]{
+ "--- No Trace Entries Found. " +
+ "Need to enable trace in mediator level ---"
+ };
+
+ }
+ Object[] objects;
+
+ if (amount < 1) {
+ objects = memoryAppender.getCircularQueue()
+ .getObjects(DEFAULT_NO_OF_LOGS);
+ } else {
+ objects = memoryAppender.getCircularQueue().getObjects(amount);
+ }
+ String [] resp = new String[objects.length];
+ Layout layout = new PatternLayout(DEFAULT_LOGGING_PATTERN);
+ for (int i = 0; i < objects.length; i++) {
+ LoggingEvent logEvt = (LoggingEvent) objects[i];
+ resp[i] = layout.format(logEvt);
+ }
+ return resp;
+ } else {
+ throw new ServiceBusException("");
+ }
+ }
+
public String[] getLogs(int amount) throws AxisFault {
String[] resp;
@@ -128,150 +157,4 @@
return resp;
}
-
- public MessageSummaryData[] getLastMessages(int amount) {
-
- org.wso2.esb.modules.tracer.CircularBuffer msgSeqBuff
- = (org.wso2.esb.modules.tracer.CircularBuffer) getConfigContext()
- .getProperty(TracerConstants.MSG_SEQ_BUFFER);
- Object[] messages;
- if (msgSeqBuff == null) {
- return getEmptyMessage();
- } else {
- messages = msgSeqBuff.getObjects(amount);
-
- if (messages.length == 0) {
-
- return getEmptyMessage();
- } else {
-
- MessageSummaryData[] msgSummaries = new MessageSummaryData[messages.length];
-
- for (int i = 0; i < msgSummaries.length; i++) {
- msgSummaries[i] = (MessageSummaryData) messages[i];
- }
-
- return msgSummaries;
- }
- }
- }
-
- public MessageContentData getMessage(String messageID) throws AxisFault {
-
- MessageContentData resp = null;
-
- ConfigurationContext configCtx = getConfigContext();
- HashMap messagesMap = (HashMap) configCtx.getProperty(Constants.MESSAGE_MAP_KEY);
- if (messagesMap != null) {
-
- resp = (MessageContentData) messagesMap.get(messageID);
- if (resp != null) {
-
- String receivedMessage = resp.getReceivedMessage();
- if (receivedMessage != null) {
- resp.setReceivedMessage(prettyPrint(receivedMessage));
- } else {
- resp.setReceivedMessage("");
- }
- String sentMessage = resp.getSentMessage();
- if (sentMessage != null) {
- resp.setSentMessage(prettyPrint(sentMessage));
- } else {
- resp.setSentMessage("");
- }
- } else {
- resp = new MessageContentData();
- resp.setReceivedMessage("");
- resp.setSentMessage("");
- resp.setMessageID("");
- }
-
-
- }
- return resp;
- }
-
- private String prettyPrint(String xml) throws AxisFault {
- try {
- if (xml != null && !xml.equals("")) {
- InputStream xslStream =
- Thread.currentThread().getContextClassLoader()
- .getResourceAsStream("resources/style/pretty.xsl");
- // String xml = env.toString();
- InputStream xmlStream = new ByteArrayInputStream(xml.getBytes());
- Source xmlSource = new StreamSource(xmlStream);
- Source xslSource = new StreamSource(xslStream);
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- Result result = new StreamResult(out);
- Transformer transformer =
- TransformerFactory.newInstance().newTransformer(xslSource);
- transformer.transform(xmlSource, result);
- return new String(out.toByteArray());
- } else {
- return "";
- }
- }
- catch (TransformerConfigurationException e) {
- throw new AxisFault(e);
- }
- catch (TransformerException e) {
- throw new AxisFault(e);
- }
-
- }
-
- private MessageSummaryData[] getEmptyMessage() {
- MessageSummaryData[] param = new MessageSummaryData[1];
- MessageSummaryData msgSummaryData = new MessageSummaryData();
- msgSummaryData.setServiceId("");
- msgSummaryData.setOperationName("");
- msgSummaryData.setMessageID("");
-
- GregorianCalendar cal = new GregorianCalendar();
- cal.setTime(new Date());
- msgSummaryData.setTimestamp(cal);
- param[0] = msgSummaryData;
-
- return param;
- }
-
- private MessageSummaryData getMessageSummaryData(Object[] messageSummeries, String messageID) {
- for (int i = 0; i < messageSummeries.length; i++) {
- MessageSummaryData messageSummaryData = ((MessageSummaryData) messageSummeries[i]);
- if (messageSummaryData != null && (messageSummaryData.getMessageID()).equals(messageID))
- {
- return messageSummaryData;
- }
-
- }
- return null;
- }
-
- public boolean removeMessage(String messageID) {
-
- org.wso2.esb.modules.tracer.CircularBuffer msgSeqBuff
- = (org.wso2.esb.modules.tracer.CircularBuffer) getConfigContext()
- .getProperty(TracerConstants.MSG_SEQ_BUFFER);
- Object[] messageSummeries = msgSeqBuff.getObjects(Constants.MSG_BUFFER_SIZE - 1);
- Object messageSummery = getMessageSummaryData(messageSummeries, messageID);
- HashMap messagesMap = (HashMap) getConfigContext().getProperty(Constants.MESSAGE_MAP_KEY);
- if (messagesMap != null) {
- if (messagesMap.containsKey(messageID)) {
- messagesMap.remove(messageID);
- if (messageSummery != null)
- msgSeqBuff.remove(messageSummery);
- getConfigContext().setProperty(Constants.MESSAGE_MAP_KEY, messagesMap);
- getConfigContext().setProperty(TracerConstants.MSG_SEQ_BUFFER, msgSeqBuff);
- }
- }
- return true;
- }
-
- public boolean removeAll() {
-
- getConfigContext().getProperties().remove(Constants.MESSAGE_MAP_KEY);
- getConfigContext().getProperties().remove(TracerConstants.MSG_SEQ_BUFFER);
- return true;
- }
-
}
Modified: esb/java/trunk/modules/core/src/main/java/org/wso2/esb/services/ServiceAdmin.java
==============================================================================
--- esb/java/trunk/modules/core/src/main/java/org/wso2/esb/services/ServiceAdmin.java (original)
+++ esb/java/trunk/modules/core/src/main/java/org/wso2/esb/services/ServiceAdmin.java Mon Feb 5 00:09:58 2007
@@ -21,13 +21,13 @@
import org.wso2.esb.ServiceBusException;
import org.wso2.esb.persistence.PersistenceManager;
import org.wso2.esb.persistence.dataobject.StatisticsDO;
-import org.wso2.esb.services.utils.StatisticsData;
import org.wso2.esb.services.utils.GraphData;
+import org.wso2.esb.services.utils.StatisticsData;
import org.wso2.esb.statistics.persistence.StatisticsDBUtils;
import org.wso2.esb.util.HibernateConfigFactory;
-import java.util.List;
import java.util.Iterator;
+import java.util.List;
/**
*
@@ -182,7 +182,6 @@
}
public String[] listSequence() throws ServiceBusException {
-
StatisticsDO[] statisticsRecords = StatisticsDBUtils.getStatistics(pm, Constants.SEQUENCE_STATISTICS);
String[] names = new String[statisticsRecords.length];
for (int i = 0; i < names.length; i++) {
More information about the Esb-java-dev
mailing list