You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ho...@apache.org on 2009/07/09 21:23:59 UTC
svn commit: r792643 - in /lucene/solr/trunk: CHANGES.txt
src/webapp/web/WEB-INF/web.xml src/webapp/web/admin/action.jsp
src/webapp/web/admin/logging.jsp src/webapp/web/admin/logging.xsl
Author: hossman
Date: Thu Jul 9 19:23:59 2009
New Revision: 792643
URL: http://svn.apache.org/viewvc?rev=792643&view=rev
Log:
SOLR-1257: removed logging.jsp and refrences to it in admin.jsp
Removed:
lucene/solr/trunk/src/webapp/web/admin/logging.jsp
lucene/solr/trunk/src/webapp/web/admin/logging.xsl
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/src/webapp/web/WEB-INF/web.xml
lucene/solr/trunk/src/webapp/web/admin/action.jsp
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=792643&r1=792642&r2=792643&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Thu Jul 9 19:23:59 2009
@@ -537,6 +537,12 @@
40. SOLR-1233: remove /select?qt=/whatever restriction on /-prefixed request handlers.
(ehatcher)
+41. SOLR-1257: logging.jsp has been removed and now passes through to the
+ hierarchical log level tool added in Solr 1.3. Users still
+ hitting "/admin/logging.jsp" should switch to "/admin/logging".
+ (hossman)
+
+
Build
----------------------
1. SOLR-776: Added in ability to sign artifacts via Ant for releases (gsingers)
Modified: lucene/solr/trunk/src/webapp/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/WEB-INF/web.xml?rev=792643&r1=792642&r2=792643&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/WEB-INF/web.xml (original)
+++ lucene/solr/trunk/src/webapp/web/WEB-INF/web.xml Thu Jul 9 19:23:59 2009
@@ -132,6 +132,12 @@
<servlet-name>ping</servlet-name>
<url-pattern>/admin/ping</url-pattern>
</servlet-mapping>
+
+ <!-- @Deprecated -->
+ <servlet-mapping>
+ <servlet-name>Logging</servlet-name>
+ <url-pattern>/admin/logging.jsp</url-pattern>
+ </servlet-mapping>
<mime-mapping>
<extension>.xsl</extension>
Modified: lucene/solr/trunk/src/webapp/web/admin/action.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/action.jsp?rev=792643&r1=792642&r2=792643&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/action.jsp (original)
+++ lucene/solr/trunk/src/webapp/web/admin/action.jsp Thu Jul 9 19:23:59 2009
@@ -22,13 +22,10 @@
java.net.InetAddress,
java.net.UnknownHostException"%>
<%@ page import="java.util.Date"%>
-<%@ page import="java.util.logging.Level"%>
-<%@ page import="java.util.logging.Logger"%>
<%@include file="header.jsp" %>
<%
String action = request.getParameter("action");
- String logging = request.getParameter("log");
String enableActionStatus = "";
boolean isValid = false;
@@ -37,10 +34,6 @@
if ("Enable".compareTo(action) == 0) isValid = true;
if ("Disable".compareTo(action) == 0) isValid = true;
}
- if (logging != null) {
- action = "Set Log Level";
- isValid = true;
- }
if (isValid) {
if ("Enable".compareTo(action) == 0) {
try {
@@ -70,26 +63,11 @@
enableActionStatus += "Disable Failed: " + e.toString();
}
}
- if (logging != null) {
- try {
- Logger log = SolrCore.log;
- Logger parent = log.getParent();
- while (parent != null) {
- log = parent;
- parent = log.getParent();
- }
- log.setLevel(Level.parse(logging));
- enableActionStatus = "Set Log Level (" + logging + ") Succeeded";
- } catch(Exception e) {
- enableActionStatus += "Set Log Level (" + logging + ") Failed: "
- + e.toString();
- }
- }
} else {
enableActionStatus = "Illegal Action";
}
// :TODO: might want to rework this so any logging change happens *after*
- SolrCore.log.log(Level.INFO, enableActionStatus);
+ SolrCore.log.info(enableActionStatus);
%>
<br clear="all">
<table>