You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2012/03/06 12:17:51 UTC
svn commit: r1297427 - in /lucene/dev/branches/branch_3x/solr: ./ core/
core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
Author: siren
Date: Tue Mar 6 11:17:51 2012
New Revision: 1297427
URL: http://svn.apache.org/viewvc?rev=1297427&view=rev
Log:
SOLR-3148: expose more system info
Modified:
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/core/ (props changed)
lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
Modified: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=1297427&r1=1297426&r2=1297427&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Tue Mar 6 11:17:51 2012
@@ -112,16 +112,18 @@ public class SystemInfoHandler extends R
// Java 1.6
addGetterIfAvaliable( os, "systemLoadAverage", info );
+ // com.sun.management.OperatingSystemMXBean
+ addGetterIfAvaliable( os, "committedVirtualMemorySize", info);
+ addGetterIfAvaliable( os, "freePhysicalMemorySize", info);
+ addGetterIfAvaliable( os, "freeSwapSpaceSize", info);
+ addGetterIfAvaliable( os, "processCpuTime", info);
+ addGetterIfAvaliable( os, "totalPhysicalMemorySize", info);
+ addGetterIfAvaliable( os, "totalSwapSpaceSize", info);
+
// com.sun.management.UnixOperatingSystemMXBean
addGetterIfAvaliable( os, "openFileDescriptorCount", info );
addGetterIfAvaliable( os, "maxFileDescriptorCount", info );
- // com.sun.management.OperatingSystemMXBean
- addGetterIfAvaliable( os, "committedVirtualMemorySize", info );
- addGetterIfAvaliable( os, "totalPhysicalMemorySize", info );
- addGetterIfAvaliable( os, "totalSwapSpaceSize", info );
- addGetterIfAvaliable( os, "processCpuTime", info );
-
try {
if( !os.getName().toLowerCase(Locale.ENGLISH).startsWith( "windows" ) ) {
// Try some command line things
@@ -149,6 +151,7 @@ public class SystemInfoHandler extends R
try {
String n = Character.toUpperCase( getter.charAt(0) ) + getter.substring( 1 );
Method m = obj.getClass().getMethod( "get" + n );
+ m.setAccessible(true);
Object v = m.invoke( obj, (Object[])null );
if( v != null ) {
info.add( getter, v );