Author: indika
Date: Wed Jan 9 01:16:25 2008
New Revision: 12024
Log:
refactor ServerStauts class to use it in ServerStausView MBean
Modified:
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBus.java
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/jmx/mbean/ServerStatusView.java
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/services/tos/ServerStatus.java
Modified:
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBus.java
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBus.java
(original)
+++
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBus.java
Wed Jan 9 01:16:25 2008
@@ -52,13 +52,13 @@
}
ServiceBusConfiguration.getInstance();
try {
- String server_web_xml =
System.getProperty(ServiceBusConstants.ESB_SERVER_WEB_XML);
- if (server_web_xml == null || "".equals(server_web_xml)) {
- server_web_xml = ServiceBusConstants.ESB_CONF_DIRECTORY +
File.separator +
+ String serverWebXML =
System.getProperty(ServiceBusConstants.ESB_SERVER_WEB_XML);
+ if (serverWebXML == null || "".equals(serverWebXML)) {
+ serverWebXML = ServiceBusConstants.ESB_CONF_DIRECTORY +
File.separator +
ServiceBusConstants.ESB_SERVER_WEB_XML;
}
XmlConfigurationFactory.init(ServiceBusConstants.ESB_WEB_XML_KEY,
- server_web_xml, ServiceBusConstants.ESB_XML_NAMESPACE);
+ serverWebXML, ServiceBusConstants.ESB_XML_NAMESPACE);
} catch (ServerException e) {
log.error("Error loading server-web.xml", e);
}
Modified:
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/jmx/mbean/ServerStatusView.java
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/jmx/mbean/ServerStatusView.java
(original)
+++
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/jmx/mbean/ServerStatusView.java
Wed Jan 9 01:16:25 2008
@@ -30,40 +30,40 @@
public class ServerStatusView implements ServerStatusViewMBean {
- private ServerStatus serverStatus;
+ private final ServerStatus serverStatus;
public ServerStatusView() {
- update();
+ this.serverStatus = new ServerStatus();
}
public String viewSystemUpTime() {
update();
- return serverStatus.getSystemUpTime();
+ return this.serverStatus.getSystemUpTime();
}
public String viewServerStartTime() {
update();
- return serverStatus.getServerStartTime();
+ return this.serverStatus.getServerStartTime();
}
public String viewServerName() {
update();
- return serverStatus.getServerName();
+ return this.serverStatus.getServerName();
}
public String viewFreeMemory() {
update();
- return serverStatus.getFreeMemory();
+ return this.serverStatus.getFreeMemory();
}
public String viewTotalMemory() {
update();
- return serverStatus.getTotalMemory();
+ return this.serverStatus.getTotalMemory();
}
private void update() {
try {
- this.serverStatus = new ServerStatus(
+ this.serverStatus.updateStates(
ServiceBusManager.getInstance().getConfigurationContext().getAxisConfiguration());
} catch (AxisFault axisFault) {
throw new ServiceBusException("Error initiating ServerStatusView",
axisFault);
Modified:
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java
(original)
+++
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/services/ServerAdmin.java
Wed Jan 9 01:16:25 2008
@@ -43,7 +43,9 @@
private static Log log = LogFactory.getLog(ServerAdmin.class);
public ServerStatus getStatus() throws AxisFault {
- return new ServerStatus(getAxisConfig());
+ ServerStatus serverStatus = new ServerStatus();
+ serverStatus.updateStates(getAxisConfig());
+ return serverStatus;
}
public ServerData getServerData() throws AxisFault {
Modified:
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/services/tos/ServerStatus.java
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/services/tos/ServerStatus.java
(original)
+++
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/services/tos/ServerStatus.java
Wed Jan 9 01:16:25 2008
@@ -49,7 +49,7 @@
private long maxResponseTime;
private SimpleDateFormat dateFormatter = new SimpleDateFormat(
- "yyyy-MM-dd HH:mm:ss");
+ "yyyy-MM-dd HH:mm:ss");
/**
* Generate server status data reading necessary information from the
@@ -58,7 +58,7 @@
* @param axisConfig
* @throws AxisFault
*/
- public ServerStatus(AxisConfiguration axisConfig) throws AxisFault {
+ public void updateStates(AxisConfiguration axisConfig) throws AxisFault {
Parameter systemStartTime =
axisConfig.getParameter(StatisticsConstants.SERVER_START_TIME);
long startTime = ((Long) systemStartTime.getValue()).longValue();
@@ -77,19 +77,19 @@
}
responseCount =
- ((org.wso2.statistics.Counter) axisConfig.
-
getParameter(StatisticsConstants.GLOBAL_RESPONSE_COUNTER).getValue()).
- getCount();
+ ((org.wso2.statistics.Counter) axisConfig.
+
getParameter(StatisticsConstants.GLOBAL_RESPONSE_COUNTER).getValue()).
+ getCount();
faultCount =
- ((org.wso2.statistics.Counter) axisConfig.
-
getParameter(StatisticsConstants.GLOBAL_FAULT_COUNTER).getValue()).
- getCount();
+ ((org.wso2.statistics.Counter) axisConfig.
+
getParameter(StatisticsConstants.GLOBAL_FAULT_COUNTER).getValue()).
+ getCount();
- freeMemory = formatMemoryValue(Runtime.getRuntime().freeMemory());
+ freeMemory = formatMemoryValue(Runtime.getRuntime().freeMemory());
totalMemory = formatMemoryValue(Runtime.getRuntime().totalMemory());
AxisServiceGroup asg =
-
axisConfig.getServiceGroup(org.wso2.esb.ServiceBusConstants.ADMIN_SERVICE_GROUP);
+
axisConfig.getServiceGroup(org.wso2.esb.ServiceBusConstants.ADMIN_SERVICE_GROUP);
int adminservicecout = 0;
int activeServices = 0;
@@ -102,14 +102,14 @@
AxisService axisService = (AxisService) iter.next();
Parameter parameter =
-
axisService.getParameter(StatisticsConstants.SERVICE_REQUEST_COUNTER);
+
axisService.getParameter(StatisticsConstants.SERVICE_REQUEST_COUNTER);
if (parameter != null) {
totalRequestForAdmin += ((Counter)
parameter.getValue()).getCount();
}
Parameter faultCounterParameter =
-
axisService.getParameter(StatisticsConstants.SERVICE_FAULT_COUNTER);
+
axisService.getParameter(StatisticsConstants.SERVICE_FAULT_COUNTER);
if (faultCounterParameter != null) {
totalFaultCountForAdmin += ((Counter)
faultCounterParameter.getValue()).getCount();
@@ -134,12 +134,12 @@
}
// counter includes Synapse Service as well
- // Following code only Shows the awailable proxy services.
- requestCount -= totalRequestForAdmin;
+ // Following code only Shows the awailable proxy services.
+ requestCount -= totalRequestForAdmin;
responseCount -= totalResponseFromAdmin;
- faultCount -= totalFaultCountForAdmin;
- this.services = activeServices - adminservicecout - 1;
- serverName = org.wso2.esb.ServiceBusConstants.ESB_INSTANCE;
+ faultCount -= totalFaultCountForAdmin;
+ this.services = activeServices - adminservicecout - 1;
+ serverName = org.wso2.esb.ServiceBusConstants.ESB_INSTANCE;
avgResponseTime =
StatisticsModule.responseTimeProcessor.getAvgResponseTime();
maxResponseTime =
StatisticsModule.responseTimeProcessor.getMaxResponseTime();
@@ -168,20 +168,20 @@
StringBuffer sb = new StringBuffer();
long remainder = seconds;
- int days = (int) remainder / (60*60*24);
- remainder = remainder - days*60*60*24;
+ int days = (int) remainder / (60 * 60 * 24);
+ remainder = remainder - days * 60 * 60 * 24;
if (days > 0) {
sb.append(" ").append(days).append(days == 1 ? " day" : " days");
}
- int hours = (int) remainder / (60*60);
- remainder = remainder - hours*60*60;
+ int hours = (int) remainder / (60 * 60);
+ remainder = remainder - hours * 60 * 60;
if (hours > 0) {
sb.append(" ").append(hours).append(hours == 1 ? " hr" : " hrs");
}
int minutes = (int) remainder / (60);
- remainder = remainder - minutes*60;
+ remainder = remainder - minutes * 60;
if (minutes > 0) {
sb.append(" ").append(minutes).append(minutes == 1 ? " min" : "
mins");
}
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
