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

SOLR-1750 cleanup, renamed/moved class, and eliminated overlapping functionality with SystemInfoHandler 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@953886 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris M. Hostetter 2010-06-11 21:46:58 +00:00
parent d0e4a7eab9
commit a0d0ae4f21
3 changed files with 18 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -127,7 +127,7 @@ New Features
* SOLR-1268: Incorporate FastVectorHighlighter (koji)
* SOLR-1750: SystemInfoRequestHandler added for simpler programmatic access
* SOLR-1750: SolrInfoMBeanHandler added for simpler programmatic access
to info currently available from registry.jsp and stats.jsp
(ehatcher, hossman)

1
solr/src/java/org/apache/solr/handler/admin/AdminHandlers.java
View File

@ -82,6 +82,7 @@ public class AdminHandlers implements SolrCoreAware, SolrRequestHandler
StandardHandler[] list = new StandardHandler[] {
new StandardHandler( "luke", new LukeRequestHandler() ),
new StandardHandler( "system", new SystemInfoHandler() ),
new StandardHandler( "mbeans", new SolrInfoMBeanHandler() ),
new StandardHandler( "plugins", new PluginInfoHandler() ),
new StandardHandler( "threads", new ThreadDumpHandler() ),
new StandardHandler( "properties", new PropertiesRequestHandler() ),

61
solr/src/java/org/apache/solr/handler/SystemInfoRequestHandler.java → solr/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
View File

@ -1,5 +1,6 @@
package org.apache.solr.handler;
package org.apache.solr.handler.admin;
import org.apache.solr.handler.RequestHandlerBase;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.core.SolrInfoMBean;
import org.apache.solr.core.SolrCore;
@ -7,10 +8,6 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.lucene.LucenePackage;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Date;
import java.util.Set;
import java.util.Map;
@ -18,20 +15,10 @@ import java.util.HashSet;
import java.util.HashMap;
/**
* A request handler that provides System Information about the
* current running instance and all registered SolrMBeans.
* A request handler that provides info about all
* registered SolrInfoMBeans.
*/
public class SystemInfoRequestHandler extends RequestHandlerBase {
static InetAddress addr = null;
static String hostname = "unknown";
static {
try {
addr = InetAddress.getLocalHost();
hostname = addr.getCanonicalHostName();
} catch (UnknownHostException e) {
//default to unknown
}
}
public class SolrInfoMBeanHandler extends RequestHandlerBase {
/**
* Take an array of any type and generate a Set containing the toString.
@ -41,7 +28,7 @@ public class SystemInfoRequestHandler extends RequestHandlerBase {
HashSet<String> r = new HashSet<String>();
if (null == arr) return r;
for (Object o : arr) {
r.add(o.toString());
if (null != o) r.add(o.toString());
}
return r;
}
@ -49,35 +36,19 @@ public class SystemInfoRequestHandler extends RequestHandlerBase {
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
SolrCore core = req.getCore();
rsp.add("core", core.getName());
rsp.add("schema", req.getSchema().getSchemaName());
rsp.add("start", new Date(core.getStartTime()));
rsp.add("now", new Date().toString());
rsp.add("host", hostname);
rsp.add("cwd", System.getProperty("user.dir"));
rsp.add("instanceDir", core.getSolrConfig().getInstanceDir());
Package solrP = SolrCore.class.getPackage();
Package luceneP = LucenePackage.class.getPackage();
NamedList version = new NamedList();
version.add("solrSpecVersion", solrP.getSpecificationVersion());
version.add("solrImplVersion", solrP.getImplementationVersion());
version.add("luceneSpecVersion", luceneP.getSpecificationVersion());
version.add("luceneImplVersion", luceneP.getImplementationVersion());
rsp.add("version", version);
NamedList cats = new NamedList();
rsp.add("objects", cats);
rsp.add("solr-mbeans", cats);
Set<String> requestedCats = arrayToSet(req.getParams().getParams("cat"));
if (requestedCats.isEmpty()) {
String[] requestedCats = req.getParams().getParams("cat");
if (null == requestedCats || 0 == requestedCats.length) {
for (SolrInfoMBean.Category cat : SolrInfoMBean.Category.values()) {
requestedCats.add(cat.name());
cats.add(cat.name(), new SimpleOrderedMap());
}
} else {
for (String catName : requestedCats) {
cats.add(catName,new SimpleOrderedMap());
}
}
for (String catName : requestedCats) {
cats.add(catName,new SimpleOrderedMap());
}
Set<String> requestedKeys = arrayToSet(req.getParams().getParams("key"));
@ -98,7 +69,7 @@ public class SystemInfoRequestHandler extends RequestHandlerBase {
mBeanInfo.add("description", m.getDescription());
mBeanInfo.add("srcId", m.getSourceId());
mBeanInfo.add("src", m.getSource());
mBeanInfo.add("docs", arrayToSet(m.getDocs()));
mBeanInfo.add("docs", m.getDocs());
if (req.getParams().getFieldBool(key, "stats", false))
mBeanInfo.add("stats", m.getStatistics());
@ -109,7 +80,7 @@ public class SystemInfoRequestHandler extends RequestHandlerBase {
}
public String getDescription() {
return "Get Solr component statistics";
return "Get Info (and statistics) about all registered SolrInfoMBeans";
}
public String getSourceId() {