You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ge...@apache.org on 2020/08/13 02:57:47 UTC
[lucene-solr] branch branch_8x updated: SOLR-14748: Correct
condition on startup auth/ssl logging
This is an automated email from the ASF dual-hosted git repository.
gerlowskija pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 50b6cf1 SOLR-14748: Correct condition on startup auth/ssl logging
50b6cf1 is described below
commit 50b6cf1e3b51801926ef312a2a047a87d8ab6630
Author: Jason Gerlowski <ja...@lucidworks.com>
AuthorDate: Wed Aug 12 15:09:49 2020 -0400
SOLR-14748: Correct condition on startup auth/ssl logging
---
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/core/CoreContainer.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 099e17d..9ef0c49 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -68,6 +68,8 @@ Bug Fixes
* SOLR-14657: Improve error handling in IndexReader realted metrics that were causing scary ERROR logging
if metrics were requested while Solr was in the process of closing/re-opening a new IndexReader. (hossman)
+* SOLR-14748: Fix incorrect auth/SSL startup logging (Jason Gerlowski)
+
Other Changes
---------------------
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 6c4eb58..1695067 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -963,7 +963,7 @@ public class CoreContainer {
(authorizationPlugin != null) ? "enabled" : "disabled");
}
- if (authenticationPlugin !=null && StringUtils.isNotEmpty(System.getProperty("solr.jetty.https.port"))) {
+ if (authenticationPlugin != null && StringUtils.isEmpty(System.getProperty("solr.jetty.https.port"))) {
log.warn("Solr authentication is enabled, but SSL is off. Consider enabling SSL to protect user credentials and data with encryption.");
}
}