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/02/23 21:18:24 UTC

svn commit: r1292938 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java

Author: siren
Date: Thu Feb 23 20:18:24 2012
New Revision: 1292938

URL: http://svn.apache.org/viewvc?rev=1292938&view=rev
Log:
SOLR-3148: expose more system info

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=1292938&r1=1292937&r2=1292938&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Thu Feb 23 20:18:24 2012
@@ -124,20 +124,20 @@ public class SystemInfoHandler extends R
     info.add( "name", os.getName() );
     info.add( "version", os.getVersion() );
     info.add( "arch", os.getArch() );
+    info.add( "systemLoadAverage", os.getSystemLoadAverage());
 
-    // 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
@@ -165,6 +165,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 );