You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2012/11/20 02:13:13 UTC
svn commit: r1411495 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
Author: hossman
Date: Tue Nov 20 01:13:12 2012
New Revision: 1411495
URL: http://svn.apache.org/viewvc?rev=1411495&view=rev
Log:
SOLR-3970: SystemInfoHandler now exposes more details about the JRE/VM/Java version in use
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1411495&r1=1411494&r2=1411495&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Nov 20 01:13:12 2012
@@ -73,6 +73,9 @@ New Features
* SOLR-4088: New and improved auto host detection strategy for SolrCloud.
(Raintung Li via Mark Miller)
+* SOLR-3970: SystemInfoHandler now exposes more details about the
+ JRE/VM/Java version in use. (hossman)
+
Optimizations
----------------------
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=1411495&r1=1411494&r2=1411495&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 Tue Nov 20 01:13:12 2012
@@ -211,8 +211,36 @@ public class SystemInfoHandler extends R
public static SimpleOrderedMap<Object> getJvmInfo()
{
SimpleOrderedMap<Object> jvm = new SimpleOrderedMap<Object>();
- jvm.add( "version", System.getProperty("java.vm.version") );
- jvm.add( "name", System.getProperty("java.vm.name") );
+
+ final String javaVersion = System.getProperty("java.specification.version", "unknown");
+ final String javaVendor = System.getProperty("java.specification.vendor", "unknown");
+ final String javaName = System.getProperty("java.specification.name", "unknown");
+ final String jreVersion = System.getProperty("java.version", "unknown");
+ final String jreVendor = System.getProperty("java.vendor", "unknown");
+ final String vmVersion = System.getProperty("java.vm.version", "unknown");
+ final String vmVendor = System.getProperty("java.vm.vendor", "unknown");
+ final String vmName = System.getProperty("java.vm.name", "unknown");
+
+ // Summary Info
+ jvm.add( "version", jreVersion + " " + vmVersion);
+ jvm.add( "name", jreVendor + " " + vmName );
+
+ // details
+ SimpleOrderedMap<Object> java = new SimpleOrderedMap<Object>();
+ java.add( "vendor", javaVendor );
+ java.add( "name", javaName );
+ java.add( "version", javaVersion );
+ jvm.add( "spec", java );
+ SimpleOrderedMap<Object> jre = new SimpleOrderedMap<Object>();
+ jre.add( "vendor", jreVendor );
+ jre.add( "version", jreVersion );
+ jvm.add( "jre", jre );
+ SimpleOrderedMap<Object> vm = new SimpleOrderedMap<Object>();
+ vm.add( "vendor", vmVendor );
+ vm.add( "name", vmName );
+ vm.add( "version", vmVersion );
+ jvm.add( "vm", vm );
+
Runtime runtime = Runtime.getRuntime();
jvm.add( "processors", runtime.availableProcessors() );