You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by st...@apache.org on 2012/10/02 12:28:35 UTC
svn commit: r1392825 - in /lucene/dev/branches/lucene_solr_4_0: ./
dev-tools/ lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/codecs/ lucene/core/ lucene/core/src/test/org/ap...
Author: steffkes
Date: Tue Oct 2 10:28:33 2012
New Revision: 1392825
URL: http://svn.apache.org/viewvc?rev=1392825&view=rev
Log:
SOLR-3560: Handle different types of Exception Messages for Logging UI (merge r1389981)
Modified:
lucene/dev/branches/lucene_solr_4_0/ (props changed)
lucene/dev/branches/lucene_solr_4_0/dev-tools/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/BUILD.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/CHANGES.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/analysis/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/backwards/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/benchmark/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/codecs/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/demo/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/facet/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/grouping/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/highlighter/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/join/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/memory/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/misc/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/module-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/queries/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/queryparser/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/sandbox/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/site/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/spatial/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/suggest/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_0/lucene/tools/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt
lucene/dev/branches/lucene_solr_4_0/solr/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/cloud-dev/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/contrib/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/example/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/scripts/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/site/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/solrj/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/testlogging.properties (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/webapp/ (props changed)
lucene/dev/branches/lucene_solr_4_0/solr/webapp/web/js/scripts/logging.js
Modified: lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt?rev=1392825&r1=1392824&r2=1392825&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_0/solr/CHANGES.txt Tue Oct 2 10:28:33 2012
@@ -163,6 +163,8 @@ Optimizations
* SOLR-3709: Cache the url list created from the ClusterState in CloudSolrServer
on each request. (Mark Miller)
+* SOLR-3560: Handle different types of Exception Messages for Logging UI
+ (steffkes)
Bug Fixes
----------------------
Modified: lucene/dev/branches/lucene_solr_4_0/solr/webapp/web/js/scripts/logging.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_0/solr/webapp/web/js/scripts/logging.js?rev=1392825&r1=1392824&r2=1392825&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_0/solr/webapp/web/js/scripts/logging.js (original)
+++ lucene/dev/branches/lucene_solr_4_0/solr/webapp/web/js/scripts/logging.js Tue Oct 2 10:28:33 2012
@@ -317,6 +317,18 @@ var load_logging_viewer = function()
for( var i = 0; i < docs_count; i++ )
{
var doc = docs[i];
+
+ if( !doc.trace )
+ {
+ var lines = doc.message.split( "\n" );
+ if( 1 < lines.length )
+ {
+ doc.message = lines[0];
+ doc.trace = doc.message;
+ delete lines;
+ }
+ }
+
var has_trace = 'undefined' !== typeof( doc.trace );
doc.logger = '<abbr title="' + doc.logger.esc() + '">' + doc.logger.split( '.' ).pop().esc() + '</abbr>';