You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2023/09/10 18:40:29 UTC
[solr] branch main updated: SOLR-16044: SlowRequest logging disabled if SolrCore logger set to ERROR (#1907)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new ca4692b5a26 SOLR-16044: SlowRequest logging disabled if SolrCore logger set to ERROR (#1907)
ca4692b5a26 is described below
commit ca4692b5a26a060831a6682e4961f93b9871362b
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Sun Sep 10 20:40:24 2023 +0200
SOLR-16044: SlowRequest logging disabled if SolrCore logger set to ERROR (#1907)
---
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/core/SolrCore.java | 2 +-
solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3ee0834653b..945e2b508a7 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -164,6 +164,8 @@ Bug Fixes
* SOLR-16955: Tracing v2 apis breaks SecurityConfHandler (Alex Deparvu, David Smiley)
+* SOLR-16044: SlowRequest logging is no longer disabled if SolrCore logger set to ERROR (janhoy, hossman)
+
Dependency Upgrades
---------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index b1c723aa7a5..944d4684016 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -2901,7 +2901,7 @@ public class SolrCore implements SolrInfoBean, Closeable {
}
/* slowQueryThresholdMillis defaults to -1 in SolrConfig -- not enabled.*/
- if (log.isWarnEnabled() && slowQueryThresholdMillis >= 0) {
+ if (slowLog.isWarnEnabled() && slowQueryThresholdMillis >= 0) {
final long qtime = (long) (req.getRequestTimer().getTime());
if (qtime >= slowQueryThresholdMillis) {
slowLog.warn("slow: {}", rsp.getToLogAsString());
diff --git a/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java b/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java
index 4ce9490c115..3925b297d6a 100644
--- a/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java
+++ b/solr/core/src/java/org/apache/solr/jersey/PostRequestLoggingFilter.java
@@ -101,7 +101,7 @@ public class PostRequestLoggingFilter implements ContainerResponseFilter {
response.responseHeader.qTime);
/* slowQueryThresholdMillis defaults to -1 in SolrConfig -- not enabled.*/
- if (log.isWarnEnabled()
+ if (slowCoreRequestLogger.isWarnEnabled()
&& solrConfig != null
&& solrConfig.slowQueryThresholdMillis >= 0
&& response.responseHeader.qTime >= solrConfig.slowQueryThresholdMillis) {