mcardle 2005/12/05 20:03:50 CET
Modified files:
esiadmin cachestatus.jsp index.jsp
esiadmin/inc header.jsp
Log:
* minor refactorings
Revision Changes Path
1.2 +2 -1 esi_server/esiadmin/cachestatus.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/esiadmin/cachestatus.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +4 -0 esi_server/esiadmin/inc/header.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/esiadmin/inc/header.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +12 -9 esi_server/esiadmin/index.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/esiadmin/index.jsp.diff?r1=1.1&r2=1.2&f=h
Index: cachestatus.jsp
===================================================================
RCS file: /home/cvs/repository/esi_server/esiadmin/cachestatus.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cachestatus.jsp 5 Dec 2005 16:49:02 -0000 1.1
+++ cachestatus.jsp 5 Dec 2005 19:03:50 -0000 1.2
@@ -3,7 +3,6 @@
<%
- CacheStatus cacheStatus = new CacheStatus();
this.getServletContext().setAttribute("urlCacheEntries",cacheStatus.getUrlCacheEntries());
%>
@@ -80,9 +79,11 @@
headerClass="sortable"
/>
+
<display:setProperty name="export.pdf"
value="true"/>
</display:table>
+
<br>
<br>
<br>
Index: index.jsp
===================================================================
RCS file: /home/cvs/repository/esi_server/esiadmin/index.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.jsp 5 Dec 2005 16:49:02 -0000 1.1
+++ index.jsp 5 Dec 2005 19:03:50 -0000 1.2
@@ -5,13 +5,11 @@
<br>
<br>
<br>
-<em>
<h1>ESI Server Admin Page</h1>
-</em>
<br>
<br>
<br>
-<h2>General Cache Stats</h2>
+<h2>Access Statistics</h2>
<br>
<br>
<%
@@ -23,18 +21,23 @@
%>
<br>Number of total url Cache Accesses: <%=totalUrlCacheAccesses%>
- <br>Number of total url Cache Hits: <%=stats.getUrlCacheHits()%> or
<%=100.0*(float)stats.getUrlCacheHits()/(float)totalUrlCacheAccesses%>%
- <br>Number of total url Cache Misses: <%=stats.getUrlCacheMisses()%> or
<%=100.0*(float)stats.getUrlCacheMisses()/(float)totalUrlCacheAccesses%>%
+ <br>Number of total url Cache Hits: <%=stats.getUrlCacheHits()%> or
<%=100*stats.getUrlCacheHits()/totalUrlCacheAccesses%>%
+ <br>Number of total url Cache Misses: <%=stats.getUrlCacheMisses()%> or
<%=100*stats.getUrlCacheMisses()/totalUrlCacheAccesses%>%
<br>
<br>
<br>Number of total Content Cache Accesses:
<%=totalContentCacheAccesses%>
- <br>Number of total Content Cache Hits: <%=stats.getContentCacheHits()%>
or
<%=100.0*(float)stats.getContentCacheHits()/(float)totalContentCacheAccesses%>%
- <br>Number of total Content Cache Hits:
<%=stats.getContentCacheMisses()%> or
<%=100.0*(float)stats.getContentCacheMisses()/(float)totalContentCacheAccesses%>%
+ <br>Number of total Content Cache Hits: <%=stats.getContentCacheHits()%>
or <%=100*stats.getContentCacheHits()/totalContentCacheAccesses%>%
+ <br>Number of total Content Cache Hits:
<%=stats.getContentCacheMisses()%> or
<%=100*stats.getContentCacheMisses()/totalContentCacheAccesses%>%
<br>
<br>
<br>
<br>
-<h2>View Cache</h2>
+<h2>Cache Details</h2>
+<br>
+<br>
+<br>Number of Url Objects stored: <%=cacheStatus.getUrlCacheSize()%>
+<br>Number of Content Objects stored: <%=cacheStatus.getContentCacheSize()%>
+<br>=> Percentage of Content Sharing:
<%=100-100*cacheStatus.getContentCacheSize()/cacheStatus.getUrlCacheSize()%>%
<br>
<br>
<br>
@@ -43,7 +46,7 @@
<br>
<br>
<br>
-<h2>Cache Settings</h2>
+<h2>Settings</h2>
<br>
<br>
<%=GeneralSettings.getInstance().toString()%>
Index: header.jsp
===================================================================
RCS file: /home/cvs/repository/esi_server/esiadmin/inc/header.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- header.jsp 5 Dec 2005 16:49:03 -0000 1.1
+++ header.jsp 5 Dec 2005 19:03:50 -0000 1.2
@@ -21,6 +21,7 @@
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"
/>
<link rel="stylesheet" href="css/screen.css" type="text/css"
media="screen, print" />
</head>
+
<body>
<center><pre>
@@ -41,3 +42,6 @@
<br>
<br>
+<%
+ CacheStatus cacheStatus = new CacheStatus();
+%>
\ No newline at end of file
