Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

display inMemorySize for cache 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1354560 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-06-27 14:57:43 +00:00
parent 56fb96f87e
commit dead89634c
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/CacheEntry.java
View File

@ -39,18 +39,21 @@ public class CacheEntry
private String cacheHitRate;
private long inMemorySize;
public CacheEntry()
{
// no op
}
public CacheEntry( String key, long size, long cacheHits, long cacheMiss, String cacheHitRate )
public CacheEntry( String key, long size, long cacheHits, long cacheMiss, String cacheHitRate, long inMemorySize )
{
this.key = key;
this.size = size;
this.cacheHits = cacheHits;
this.cacheMiss = cacheMiss;
this.cacheHitRate = cacheHitRate;
this.inMemorySize = inMemorySize;
}
public String getKey()
@ -103,6 +106,16 @@ public class CacheEntry
this.cacheHitRate = cacheHitRate;
}
public long getInMemorySize()
{
return inMemorySize;
}
public void setInMemorySize( long inMemorySize )
{
this.inMemorySize = inMemorySize;
}
@Override
public String toString()
{
@ -112,7 +125,8 @@ public class CacheEntry
sb.append( ", size=" ).append( size );
sb.append( ", cacheHits=" ).append( cacheHits );
sb.append( ", cacheMiss=" ).append( cacheMiss );
sb.append( ", cacheHitRate=" ).append( cacheHitRate );
sb.append( ", cacheHitRate='" ).append( cacheHitRate ).append( '\'' );
sb.append( ", inMemorySize=" ).append( inMemorySize );
sb.append( '}' );
return sb.toString();
}

4
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
View File

@ -127,9 +127,11 @@ public class DefaultSystemStatusService
for ( Map.Entry<String, Cache> entry : caches.entrySet() )
{
CacheStatistics cacheStatistics = entry.getValue().getStatistics();
cacheEntries.add( new CacheEntry( entry.getKey(), cacheStatistics.getSize(), cacheStatistics.getCacheHits(),
cacheStatistics.getCacheMiss(),
decimalFormat.format( cacheStatistics.getCacheHitRate() ).toString() ) );
decimalFormat.format( cacheStatistics.getCacheHitRate() ).toString(),
cacheStatistics.getInMemorySize() ) );
}
return cacheEntries;

5
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
View File

@ -626,18 +626,19 @@ define("archiva.general-admin",["jquery","i18n","order!utils","order!jquery.tmpl
return [];
}
CacheEntry=function(key,size,cacheHits,cacheMiss,cacheHitRate){
CacheEntry=function(key,size,cacheHits,cacheMiss,cacheHitRate,inMemorySize){
this.key=key;
this.size=size;
this.cacheHits=cacheHits;
this.cacheMiss=cacheMiss;
this.cacheHitRate=cacheHitRate;
this.inMemorySize=inMemorySize;
}
mapCacheEntries=function(data){
if(data!=null){
return $.map(data,function(item){
return new CacheEntry(item.key,item.size,item.cacheHits,item.cacheMiss,item.cacheHitRate);
return new CacheEntry(item.key,item.size,item.cacheHits,item.cacheMiss,item.cacheHitRate,item.inMemorySize);
})
}
return [];

2
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
View File

@ -396,6 +396,7 @@
<th>${$.i18n.prop('system-status.caches.grid.header.cacheHits')}</th>
<th>${$.i18n.prop('system-status.caches.grid.header.cacheMiss')}</th>
<th>${$.i18n.prop('system-status.caches.grid.header.cacheHitRate')}</th>
<th>${$.i18n.prop('system-status.caches.grid.header.inMemorySize')}</th>
<th>${$.i18n.prop('system-status.caches.grid.header.flush')}</th>
</tr>
</thead>
@ -407,6 +408,7 @@
<td>${cacheEntry.cacheHits}</td>
<td>${cacheEntry.cacheMiss}</td>
<td>${cacheEntry.cacheHitRate}</td>
<td>${cacheEntry.inMemorySize}</td>
<td>
<a href="#" onclick="flushCache('${cacheEntry.key}')">
{{if cacheEntry.size > 0 }}