Author: hiranya
Date: Tue Apr 3 06:01:47 2012
New Revision: 1308712
URL: http://svn.apache.org/viewvc?rev=1308712&view=rev
Log:
Making the MBean names unique so they work in situations where multiple NHTTP
listeners are exposed
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ListenerContext.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/LatencyView.java
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/NhttpMetricsCollector.java
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java?rev=1308712&r1=1308711&r2=1308712&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
Tue Apr 3 06:01:47 2012
@@ -185,7 +185,7 @@ public class HttpCoreNIOSender extends A
log.error("Error starting the IOReactor", e);
}
- metrics = new NhttpMetricsCollector(false, sslContext != null);
+ metrics = new NhttpMetricsCollector(false, transportOut.getName());
handler = new ClientHandler(cfgCtx, params, metrics);
final IOEventDispatch ioEventDispatch = getEventDispatch(
handler, sslContext, sslIOSessionHandler, params, transportOut);
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ListenerContext.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ListenerContext.java?rev=1308712&r1=1308711&r2=1308712&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ListenerContext.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ListenerContext.java
Tue Apr 3 06:01:47 2012
@@ -126,7 +126,7 @@ public class ListenerContext {
}
}
- metrics = new NhttpMetricsCollector(true, ssl);
+ metrics = new NhttpMetricsCollector(true, transportIn.getName());
// create the priority based executor and parser
param =
transportIn.getParameter(NhttpConstants.PRIORITY_CONFIG_FILE_NAME);
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java?rev=1308712&r1=1308711&r2=1308712&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
Tue Apr 3 06:01:47 2012
@@ -136,8 +136,8 @@ public class ServerHandler implements NH
this.connStrategy = new DefaultConnectionReuseStrategy();
this.allocator = new HeapByteBufferAllocator();
this.activeConnections = new ArrayList<NHttpServerConnection>();
- this.latencyView = new LatencyView("NHTTPLatencyView", isHttps);
- this.s2sLatencyView = new LatencyView("NHTTPS2SLatencyView", isHttps);
+ this.latencyView = new LatencyView("NHTTPLatencyView",
listenerContext.getTransportIn().getName());
+ this.s2sLatencyView = new LatencyView("NHTTPS2SLatencyView",
listenerContext.getTransportIn().getName());
this.threadingView = new ThreadingView("HttpServerWorker", true, 50);
this.restDispatching = listenerContext.isRestDispatching();
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/LatencyView.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/LatencyView.java?rev=1308712&r1=1308711&r2=1308712&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/LatencyView.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/LatencyView.java
Tue Apr 3 06:01:47 2012
@@ -90,9 +90,9 @@ public class LatencyView implements Late
private String latencyMode;
private String name;
- public LatencyView(final String latencyMode, boolean isHttps) {
+ public LatencyView(final String latencyMode, String transportName) {
this.latencyMode = latencyMode;
- name = "nio-http" + (isHttps ? "s" : "");
+ this.name = "nio-" + transportName;
scheduler = Executors.newSingleThreadScheduledExecutor(new
ThreadFactory() {
public Thread newThread(Runnable r) {
Modified:
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/NhttpMetricsCollector.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/NhttpMetricsCollector.java?rev=1308712&r1=1308711&r2=1308712&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/NhttpMetricsCollector.java
(original)
+++
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/NhttpMetricsCollector.java
Tue Apr 3 06:01:47 2012
@@ -40,9 +40,9 @@ public class NhttpMetricsCollector exten
private ConnectionsView view;
private boolean listener;
- public NhttpMetricsCollector(boolean listener, boolean isHttps) {
+ public NhttpMetricsCollector(boolean listener, String transportName) {
this.listener = listener;
- String name = "http" + (isHttps ? "s" : "") + "-" + (listener ?
"listener" : "sender");
+ String name = transportName + "-" + (listener ? "listener" : "sender");
this.view = new ConnectionsView(name);
}
