You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2018/07/30 18:24:45 UTC
[1/2] lucene-solr:master: SOLR-12558: solr/core (private) logger
rename - JettySolrRunner
Repository: lucene-solr
Updated Branches:
refs/heads/master 61e89e3ca -> 3583bdb32
SOLR-12558: solr/core (private) logger rename - JettySolrRunner
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e1063b7f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e1063b7f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e1063b7f
Branch: refs/heads/master
Commit: e1063b7f4b545b8d9f82998d0a092a389bbff188
Parents: 61e89e3
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Jul 30 18:46:12 2018 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Jul 30 18:46:12 2018 +0100
----------------------------------------------------------------------
.../solr/client/solrj/embedded/JettySolrRunner.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e1063b7f/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
index 23a8dc1..14f4dc9 100644
--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
@@ -72,7 +72,7 @@ import org.slf4j.MDC;
*/
public class JettySolrRunner {
- private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final int THREAD_POOL_MAX_THREADS = 10000;
// NOTE: needs to be larger than SolrHttpClient.threadPoolSweeperMaxIdleTime
@@ -145,20 +145,20 @@ public class JettySolrRunner {
private void executeDelay() {
int delayMs = 0;
for (Delay delay: delays) {
- log.info("Delaying "+delay.delayValue+", for reason: "+delay.reason);
+ this.log.info("Delaying "+delay.delayValue+", for reason: "+delay.reason);
if (delay.counter.decrementAndGet() == 0) {
delayMs += delay.delayValue;
}
}
if (delayMs > 0) {
- log.info("Pausing this socket connection for " + delayMs + "ms...");
+ this.log.info("Pausing this socket connection for " + delayMs + "ms...");
try {
Thread.sleep(delayMs);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
- log.info("Waking up after the delay of " + delayMs + "ms...");
+ this.log.info("Waking up after the delay of " + delayMs + "ms...");
}
}
@@ -289,7 +289,7 @@ public class JettySolrRunner {
root.getServletContext().setAttribute(SolrDispatchFilter.PROPERTIES_ATTRIBUTE, nodeProperties);
root.getServletContext().setAttribute(SolrDispatchFilter.SOLRHOME_ATTRIBUTE, solrHome);
- logger.info("Jetty properties: {}", nodeProperties);
+ log.info("Jetty properties: {}", nodeProperties);
debugFilter = root.addFilter(DebugFilter.class, "*", EnumSet.of(DispatcherType.REQUEST) );
extraFilters = new LinkedList<>();
[2/2] lucene-solr:master: SOLR-12558: solr/core (private) logger
rename - ExportWriter
Posted by cp...@apache.org.
SOLR-12558: solr/core (private) logger rename - ExportWriter
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3583bdb3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3583bdb3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3583bdb3
Branch: refs/heads/master
Commit: 3583bdb3244a15b2a741a95dbec7f762653756f1
Parents: e1063b7
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Jul 30 18:48:58 2018 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Jul 30 18:48:58 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/solr/handler/export/ExportWriter.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3583bdb3/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
index 78d0795..57ce600 100644
--- a/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
+++ b/solr/core/src/java/org/apache/solr/handler/export/ExportWriter.java
@@ -70,7 +70,7 @@ import static java.util.Collections.singletonMap;
import static org.apache.solr.common.util.Utils.makeMap;
public class ExportWriter implements SolrCore.RawWriter, Closeable {
- private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private OutputStreamWriter respWriter;
final SolrQueryRequest req;
final SolrQueryResponse res;
@@ -105,15 +105,15 @@ public class ExportWriter implements SolrCore.RawWriter, Closeable {
}
- protected void writeException(Exception e, PushWriter w, boolean log) throws IOException {
+ protected void writeException(Exception e, PushWriter w, boolean logException) throws IOException {
w.writeMap(mw -> {
mw.put("responseHeader", singletonMap("status", 400))
.put("response", makeMap(
"numFound", 0,
"docs", singletonList(singletonMap("EXCEPTION", e.getMessage()))));
});
- if (log) {
- SolrException.log(logger, e);
+ if (logException) {
+ SolrException.log(log, e);
}
}