Author: norman
Date: Thu Dec 30 19:58:59 2010
New Revision: 1053993
URL: http://svn.apache.org/viewvc?rev=1053993&view=rev
Log:
Enable JMX stats by default for smtp,lmtp,pop3. See JAMES-1166
Modified:
james/server/trunk/container-spring/src/main/config/james/lmtpserver.xml
james/server/trunk/container-spring/src/main/config/james/pop3server.xml
james/server/trunk/container-spring/src/main/config/james/smtpserver.xml
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractCommandHandlerStats.java
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/ConnectHandlerStats.java
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/LineHandlerStats.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java
Modified:
james/server/trunk/container-spring/src/main/config/james/lmtpserver.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/lmtpserver.xml?rev=1053993&r1=1053992&r2=1053993&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/lmtpserver.xml
(original)
+++ james/server/trunk/container-spring/src/main/config/james/lmtpserver.xml
Thu Dec 30 19:58:59 2010
@@ -31,6 +31,11 @@
<maxmessagesize>0</maxmessagesize>
<handlerchain>
<handler class="org.apache.james.lmtpserver.CoreCmdHandlerLoader"/>
+
+ <!-- jmx stats -->
+ <handler
class="org.apache.james.lmtpserver.jmx.CommandHandlerResultJMXMonitor"/>
+ <handler
class="org.apache.james.lmtpserver.jmx.ConnectHandlerResultJMXMonitor"/>
+ <handler
class="org.apache.james.lmtpserver.jmx.LineHandlerResultJMXMonitor"/>
</handlerchain>
</handler>
</lmtpserver>
Modified:
james/server/trunk/container-spring/src/main/config/james/pop3server.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/pop3server.xml?rev=1053993&r1=1053992&r2=1053993&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/pop3server.xml
(original)
+++ james/server/trunk/container-spring/src/main/config/james/pop3server.xml
Thu Dec 30 19:58:59 2010
@@ -34,6 +34,11 @@
<connectionLimitPerIP> 0 </connectionLimitPerIP>
<handlerchain>
<handler
class="org.apache.james.pop3server.core.CoreCmdHandlerLoader"/>
+
+ <!-- jmx stats -->
+ <handler
class="org.apache.james.pop3server.jmx.CommandHandlerResultJMXMonitor"/>
+ <handler
class="org.apache.james.pop3server.jmx.ConnectHandlerResultJMXMonitor"/>
+ <handler
class="org.apache.james.pop3server.jmx.LineHandlerResultJMXMonitor"/>
</handlerchain>
</handler>
</pop3server>
Modified:
james/server/trunk/container-spring/src/main/config/james/smtpserver.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/smtpserver.xml?rev=1053993&r1=1053992&r2=1053993&view=diff
==============================================================================
--- james/server/trunk/container-spring/src/main/config/james/smtpserver.xml
(original)
+++ james/server/trunk/container-spring/src/main/config/james/smtpserver.xml
Thu Dec 30 19:58:59 2010
@@ -35,6 +35,11 @@
<handlerchain>
<handler
class="org.apache.james.smtpserver.fastfail.ValidRcptHandler"/>
<handler class="org.apache.james.smtpserver.CoreCmdHandlerLoader"/>
+ <!-- jmx stats -->
+ <handler
class="org.apache.james.smtpserver.jmx.CommandHandlerResultJMXMonitor"/>
+ <handler
class="org.apache.james.smtpserver.jmx.ConnectHandlerResultJMXMonitor"/>
+ <handler
class="org.apache.james.smtpserver.jmx.LineHandlerResultJMXMonitor"/>
+ <handler
class="org.apache.james.smtpserver.jmx.HookResultJMXMonitor"/>
</handlerchain>
</handler>
</smtpserver>
Modified:
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractCommandHandlerStats.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractCommandHandlerStats.java?rev=1053993&r1=1053992&r2=1053993&view=diff
==============================================================================
---
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractCommandHandlerStats.java
(original)
+++
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/AbstractCommandHandlerStats.java
Thu Dec 30 19:58:59 2010
@@ -52,7 +52,7 @@ public abstract class AbstractCommandHan
this.handlerName = handlerName;
this.commands = commands;
- name = "org.apache.james:type=server,name=" + jmxName +
",handler=commandhandler,commandhandler=" + handlerName;
+ name = "org.apache.james:type=server,name=" + jmxName +
",chain=handlerchain,handler=commandhandler,commandhandler=" + handlerName;
mbeanserver = ManagementFactory.getPlatformMBeanServer();
ObjectName baseObjectName = new ObjectName(name);
mbeanserver.registerMBean(this, baseObjectName);
Modified:
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/ConnectHandlerStats.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/ConnectHandlerStats.java?rev=1053993&r1=1053992&r2=1053993&view=diff
==============================================================================
---
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/ConnectHandlerStats.java
(original)
+++
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/ConnectHandlerStats.java
Thu Dec 30 19:58:59 2010
@@ -43,7 +43,7 @@ public class ConnectHandlerStats extends
super(HandlerStatsMBean.class);
this.handlerName = handlerName;
- this.name = "org.apache.james:type=server,name=" + jmxName +
",handler=connecthandler,connecthandler=" + handlerName;
+ this.name = "org.apache.james:type=server,name=" + jmxName +
",chain=handlerchain,handler=connecthandler,connecthandler=" + handlerName;
mbeanserver = ManagementFactory.getPlatformMBeanServer();
ObjectName baseObjectName = new ObjectName(name);
mbeanserver.registerMBean(this, baseObjectName);
Modified:
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/LineHandlerStats.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/LineHandlerStats.java?rev=1053993&r1=1053992&r2=1053993&view=diff
==============================================================================
---
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/LineHandlerStats.java
(original)
+++
james/server/trunk/nio-netty/src/main/java/org/apache/james/server/jmx/LineHandlerStats.java
Thu Dec 30 19:58:59 2010
@@ -48,7 +48,7 @@ public class LineHandlerStats extends St
super(HandlerStatsMBean.class);
this.handlerName = handlerName;
- this.name = "org.apache.james:type=server,name=" + jmxName +
",handler=linehandler,linehandler=" + handlerName;
+ this.name = "org.apache.james:type=server,name=" + jmxName +
",chain=handlerchain,handler=linehandler,linehandler=" + handlerName;
mbeanserver = ManagementFactory.getPlatformMBeanServer();
ObjectName baseObjectName = new ObjectName(name);
mbeanserver.registerMBean(this, baseObjectName);
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java?rev=1053993&r1=1053992&r2=1053993&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/jmx/HookStats.java
Thu Dec 30 19:58:59 2010
@@ -52,7 +52,7 @@ public class HookStats extends StandardM
public HookStats(String jmxName, String hookname) throws
InstanceAlreadyExistsException, MBeanRegistrationException,
NotCompliantMBeanException, MalformedObjectNameException, NullPointerException {
super(HookStatsMBean.class);
this.hookname = hookname;
- name = "org.apache.james:type=server,name=" + jmxName +
",handler=hook,hook=" + hookname;
+ name = "org.apache.james:type=server,name=" + jmxName +
",chain=handlerchain,handler=hook,hook=" + hookname;
mbeanserver = ManagementFactory.getPlatformMBeanServer();
ObjectName baseObjectName = new ObjectName(name);
mbeanserver.registerMBean(this, baseObjectName);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
