Author: fhanik Date: Mon Jun 9 11:49:42 2008 New Revision: 665823 URL: http://svn.apache.org/viewvc?rev=665823&view=rev Log: add jmx accessors for session creation and last accessed time
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=665823&r1=665822&r2=665823&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jun 9 11:49:42 2008 @@ -32,13 +32,6 @@ [ New proposals should be added at the end of the list ] -* Add ManagerBase session getLastAccessedTimestamp and getCreationTimestamp for better - remote JMX access. - http://svn.apache.org/viewvc?rev=612971&view=rev - +1: pero, rjung, fhanik, markt - -1: remm: I believe it would need specific support for certain managers. Interested users - could use their own extended manager instead. - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45015 You can't use an unescaped quote if you quote the value with that character http://svn.apache.org/viewvc?rev=657231&view=rev Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=665823&r1=665822&r2=665823&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Mon Jun 9 11:49:42 2008 @@ -342,6 +342,22 @@ description="Id of the session" type="java.lang.String"/> </operation> + <operation name="getLastAccessedTimestamp" + description="Get the last access timestamp" + impact="ACTION" + returnType="long"> + <parameter name="sessionId" + description="Id of the session" + type="java.lang.String"/> + </operation> + <operation name="getCreationTimestamp" + description="Get the creation timestamp" + impact="ACTION" + returnType="long"> + <parameter name="sessionId" + description="Id of the session" + type="java.lang.String"/> + </operation> <operation name="expireAllLocalSessions" description="Exipre all active local sessions and replicate the invalid sessions" Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=665823&r1=665822&r2=665823&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java Mon Jun 9 11:49:42 2008 @@ -1203,7 +1203,13 @@ s.expire(); } - + public long getLastAccessedTimestamp( String sessionId ) { + Session s=(Session)sessions.get(sessionId); + if(s== null) + return -1 ; + return s.getLastAccessedTime(); + } + public String getLastAccessedTime( String sessionId ) { Session s=(Session)sessions.get(sessionId); if( s==null ) { @@ -1224,6 +1230,13 @@ return new Date(s.getCreationTime()).toString(); } + public long getCreationTimestamp( String sessionId ) { + Session s=(Session)sessions.get(sessionId); + if(s== null) + return -1 ; + return s.getCreationTime(); + } + // -------------------- JMX and Registration -------------------- protected String domain; protected ObjectName oname; Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml?rev=665823&r1=665822&r2=665823&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml Mon Jun 9 11:49:42 2008 @@ -160,6 +160,24 @@ type="java.lang.String"/> </operation> + <operation name="getLastAccessedTimestamp" + description="Get the last access timestamp" + impact="ACTION" + returnType="long"> + <parameter name="sessionId" + description="Id of the session" + type="java.lang.String"/> + </operation> + + <operation name="getCreationTimestamp" + description="Get the creation timestamp" + impact="ACTION" + returnType="long"> + <parameter name="sessionId" + description="Id of the session" + type="java.lang.String"/> + </operation> + </mbean> <mbean name="PersistentManager" @@ -321,6 +339,24 @@ type="java.lang.String"/> </operation> + <operation name="getLastAccessedTimestamp" + description="Get the last access timestamp" + impact="ACTION" + returnType="long"> + <parameter name="sessionId" + description="Id of the session" + type="java.lang.String"/> + </operation> + + <operation name="getCreationTimestamp" + description="Get the creation timestamp" + impact="ACTION" + returnType="long"> + <parameter name="sessionId" + description="Id of the session" + type="java.lang.String"/> + </operation> + </mbean> </mbeans-descriptors> Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=665823&r1=665822&r2=665823&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jun 9 11:49:42 2008 @@ -35,6 +35,10 @@ <section name="Tomcat 6.0.17 (remm)"> <subsection name="Catalina"> <changelog> + <update> + Add ManagerBase session getLastAccessedTimestamp and getCreationTimestamp for better + remote JMX access. (pero) + </update> <fix><bug>44595</bug> Add possibility to request the QueueSize of an executor via JMX. (jfclere) </fix> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]