[esb-java-dev] svn commit r1762 -
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services
svn at wso2.org
svn at wso2.org
Thu Apr 5 02:47:58 PDT 2007
Author: indika
Date: Thu Apr 5 02:47:55 2007
New Revision: 1762
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java
Log:
some improvement
Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java (original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java Thu Apr 5 02:47:55 2007
@@ -50,31 +50,24 @@
}
public String[] getTraceLogs(int amount) throws ServiceBusException {
-
int DEFAULT_NO_OF_LOGS = 100;
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. " +
"You need to enable tracing on the configuration elements ---"};
-
}
-
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 = memoryAppender.getLayout();
for (int i = 0; i < objects.length; i++) {
@@ -83,11 +76,10 @@
resp[i] = layout.format(logEvt);
}
}
-
return resp;
} else {
- throw new ServiceBusException("The Trace log must be configured to use the " +
- "org.wso2.utils.MemoryAppender to view entries on the admin console");
+ return new String[]{"The Trace log must be configured to use the " +
+ "org.wso2.utils.MemoryAppender to view entries on the admin console"};
}
}
@@ -104,17 +96,13 @@
} catch (Exception e) {
return false;
}
-
} else {
return false;
}
}
public String[] getLogs(int amount) throws AxisFault, ServiceBusException {
-
- String[] resp;
int DEFAULT_NO_OF_LOGS = 100;
-
Appender appender
= Logger.getRootLogger().getAppender("LOG_MEMORYAPPENDER");
if (appender instanceof MemoryAppender) {
@@ -123,48 +111,39 @@
(memoryAppender.getCircularQueue() == null) ||
(memoryAppender.getCircularQueue().getObjects(amount) == null) ||
(memoryAppender.getCircularQueue().getObjects(amount).length == 0)) {
- resp = new String[]{
+ return new String[]{
"--- No Log Entries Found. " +
"You may try increasing the log level ---"
};
-
- return resp;
}
-
Object[] objects;
-
if (amount < 1) {
objects = memoryAppender.getCircularQueue().getObjects(DEFAULT_NO_OF_LOGS);
} else {
objects = memoryAppender.getCircularQueue().getObjects(amount);
}
-
- resp = new String[objects.length];
+ String[] resp = new String[objects.length];
Layout layout = memoryAppender.getLayout();
-
for (int i = 0; i < objects.length; i++) {
LoggingEvent logEvt = (LoggingEvent) objects[i];
if (logEvt != null) {
resp[i] = layout.format(logEvt);
}
}
-
return resp;
} else {
- throw new ServiceBusException("The log must be configured to use the " +
- "org.wso2.utils.MemoryAppender to view entries on the admin console");
+ return new String[]{"The log must be configured to use the " +
+ "org.wso2.utils.MemoryAppender to view entries on the admin console"};
}
}
public String[] searchLog(int amount, String keyword) throws AxisFault, ServiceBusException {
-
if (keyword == null) {
throw new AxisFault("Key word can not be null");
}
if ("ALL".equals(keyword) || "".equals(keyword)) {
return getLogs(amount);
}
- String[] resp;
int DEFAULT_NO_OF_LOGS = 100;
Appender appender
= Logger.getRootLogger().getAppender("LOG_MEMORYAPPENDER");
@@ -174,16 +153,12 @@
(memoryAppender.getCircularQueue() == null) ||
(memoryAppender.getCircularQueue().getObjects(amount) == null) ||
(memoryAppender.getCircularQueue().getObjects(amount).length == 0)) {
- resp = new String[]{
+ return new String[]{
"--- No Log Entries Found for " +
- "the keyword " + keyword + " ---"
+ "the " + keyword + " ---"
};
-
- return resp;
}
-
Object[] objects;
-
if (amount < 1) {
objects = memoryAppender.getCircularQueue().getObjects(DEFAULT_NO_OF_LOGS);
} else {
@@ -203,13 +178,13 @@
if (resultList.isEmpty()) {
return new String[]{
"--- No Log Entries Found for " +
- "the keyword " + keyword + " ---"
+ "the " + keyword + " ---"
};
}
return (String[]) resultList.toArray(new String [resultList.size()]);
} else {
- throw new ServiceBusException("The log must be configured to use the " +
- "org.wso2.utils.MemoryAppender to view entries on the admin console");
+ return new String[]{"The log must be configured to use the " +
+ "org.wso2.utils.MemoryAppender to view entries on the admin console"};
}
}
@@ -221,7 +196,6 @@
if ("ALL".equals(keyword) || "".equals(keyword)) {
return getTraceLogs(amount);
}
- String[] resp;
int DEFAULT_NO_OF_LOGS = 100;
Logger logger = Logger.getLogger(org.apache.synapse.Constants.TRACE_LOGGER);
Appender appender = logger.getAppender("TRACE_MEMORYAPPENDER");
@@ -232,12 +206,10 @@
(memoryAppender.getCircularQueue() == null) ||
(memoryAppender.getCircularQueue().getObjects(amount) == null) ||
(memoryAppender.getCircularQueue().getObjects(amount).length == 0)) {
- resp = new String[]{
+ return new String[]{
"--- No Trace Entries Found for " +
- "the keyword " + keyword + " ---"
+ "the " + keyword + " ---"
};
-
- return resp;
}
Object[] objects;
if (amount < 1) {
@@ -259,13 +231,13 @@
if (resultList.isEmpty()) {
return new String[]{
"--- No Trace Entries Found for " +
- "the keyword " + keyword + " ---"
+ "the " + keyword + " ---"
};
}
return (String[]) resultList.toArray(new String [resultList.size()]);
} else {
- throw new ServiceBusException("The Trace log must be configured to use the " +
- "org.wso2.utils.MemoryAppender to view entries on the admin console");
+ return new String[]{"The Trace log must be configured to use the " +
+ "org.wso2.utils.MemoryAppender to view entries on the admin console"};
}
}
@@ -282,7 +254,6 @@
} catch (Exception e) {
return false;
}
-
} else {
return false;
}
More information about the Esb-java-dev
mailing list