You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2017/08/30 19:00:48 UTC
[1/3] lucene-solr:master: SOLR-10628: Fix test failures due to global
log level change
Repository: lucene-solr
Updated Branches:
refs/heads/master b4c6bfafd -> d66e2ad61
SOLR-10628: Fix test failures due to global log level change
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c4a1bd52
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c4a1bd52
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c4a1bd52
Branch: refs/heads/master
Commit: c4a1bd52e9b9bf47da1b621023590e0d012f43b7
Parents: b4c6bfa
Author: Jan Høydahl <ja...@apache.org>
Authored: Wed Aug 30 15:43:30 2017 +0200
Committer: Jan Høydahl <ja...@apache.org>
Committed: Wed Aug 30 19:58:35 2017 +0200
----------------------------------------------------------------------
.../org/apache/solr/util/StartupLoggingUtils.java | 14 ++++++++++++++
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 6 +++++-
2 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c4a1bd52/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java b/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
index 4db6a42..c582eff 100644
--- a/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
@@ -112,4 +112,18 @@ public final class StartupLoggingUtils {
log.warn("{} Dynamic log manipulation currently only supported for Log4j. "
+ "Please consult your logging framework of choice on how to configure the appropriate logging.", msg);
}
+
+ /**
+ * Return a string representing the current static ROOT logging level
+ * @return a string TRACE, DEBUG, WARN, ERROR or INFO representing current log level. Default is INFO
+ */
+ public static String getLogLevelString() {
+ final Logger rootLogger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+ if (rootLogger.isTraceEnabled()) return "TRACE";
+ else if (rootLogger.isDebugEnabled()) return "DEBUG";
+ else if (rootLogger.isInfoEnabled()) return "INFO";
+ else if (rootLogger.isWarnEnabled()) return "WARN";
+ else if (rootLogger.isErrorEnabled()) return "ERROR";
+ else return "INFO";
+ }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c4a1bd52/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index 2f2f9cc..c35004e 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -122,6 +122,7 @@ import org.apache.solr.util.RandomizeSSL.SSLRandomizer;
import org.apache.solr.util.RefCounted;
import org.apache.solr.util.RevertDefaultThreadHandlerRule;
import org.apache.solr.util.SSLTestConfig;
+import org.apache.solr.util.StartupLoggingUtils;
import org.apache.solr.util.TestHarness;
import org.apache.solr.util.TestInjection;
import org.apache.zookeeper.KeeperException;
@@ -180,6 +181,8 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
public static int DEFAULT_CONNECTION_TIMEOUT = 60000; // default socket connection timeout in ms
+ private static String initialRootLogLevel;
+
protected void writeCoreProperties(Path coreDirectory, String corename) throws IOException {
Properties props = new Properties();
props.setProperty("name", corename);
@@ -251,7 +254,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
@BeforeClass
public static void setupTestCases() {
-
+ initialRootLogLevel = StartupLoggingUtils.getLogLevelString();
initClassLogLevels();
initCoreDataDir = createTempDir("init-core-data").toFile();
@@ -321,6 +324,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
LogLevel.Configurer.restoreLogLevels(savedClassLogLevels);
savedClassLogLevels.clear();
+ StartupLoggingUtils.changeLogLevel(initialRootLogLevel);
}
/**
[2/3] lucene-solr:master: SOLR-11281: Fix precommit failures on
unused imports
Posted by ja...@apache.org.
SOLR-11281: Fix precommit failures on unused imports
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4b7171ba
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4b7171ba
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4b7171ba
Branch: refs/heads/master
Commit: 4b7171bab5275d6a5eeb60d98b5f76757c9fa0fa
Parents: c4a1bd5
Author: Jan Høydahl <ja...@apache.org>
Authored: Wed Aug 30 20:32:41 2017 +0200
Committer: Jan Høydahl <ja...@apache.org>
Committed: Wed Aug 30 20:32:41 2017 +0200
----------------------------------------------------------------------
.../org/apache/solr/metrics/reporters/SolrSlf4jReporter.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4b7171ba/solr/core/src/java/org/apache/solr/metrics/reporters/SolrSlf4jReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrSlf4jReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrSlf4jReporter.java
index 8043a78..fdb0e2a 100644
--- a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrSlf4jReporter.java
+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrSlf4jReporter.java
@@ -18,18 +18,10 @@ package org.apache.solr.metrics.reporters;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
-import java.util.SortedMap;
import java.util.concurrent.TimeUnit;
-import com.codahale.metrics.Counter;
-import com.codahale.metrics.Gauge;
-import com.codahale.metrics.Histogram;
-import com.codahale.metrics.Meter;
import com.codahale.metrics.MetricFilter;
-import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.Slf4jReporter;
-
-import com.codahale.metrics.Timer;
import org.apache.solr.metrics.FilteringSolrMetricReporter;
import org.apache.solr.metrics.SolrMetricManager;
import org.slf4j.Logger;
[3/3] lucene-solr:master: SOLR-11293: Fix precommit failures on
unused imports
Posted by ja...@apache.org.
SOLR-11293: Fix precommit failures on unused imports
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d66e2ad6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d66e2ad6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d66e2ad6
Branch: refs/heads/master
Commit: d66e2ad614c4d44ded83ddcf50843dc16e391aa8
Parents: 4b7171b
Author: Jan Høydahl <ja...@apache.org>
Authored: Wed Aug 30 20:51:57 2017 +0200
Committer: Jan Høydahl <ja...@apache.org>
Committed: Wed Aug 30 20:51:57 2017 +0200
----------------------------------------------------------------------
solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d66e2ad6/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
index e87a26b..cfdfb9d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
@@ -30,7 +30,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.JSONTestUtil;