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 2022/05/05 13:41:16 UTC
[solr] branch branch_9x updated (39ffe08d988 -> 43fc5e4bb3c)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a change to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
from 39ffe08d988 The SVN URL lacks a '-' when deleting previous RC from staging svn (#836)
new 4fae4174dae Fix typo in JWTVerificationkeyResolver exception message - verifiction -> verification (#823)
new 43fc5e4bb3c SOLR-16181 Initialize the LogWatcher earlier in CoreContainer#load() (#543)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/core/CoreContainer.java | 4 ++--
.../java/org/apache/solr/security/jwt/JWTVerificationkeyResolver.java | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
[solr] 01/02: Fix typo in JWTVerificationkeyResolver exception message - verifiction -> verification (#823)
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 4fae4174dae62de6f4330a26157c23dd78c1f82e
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Thu May 5 12:16:08 2022 +0200
Fix typo in JWTVerificationkeyResolver exception message - verifiction -> verification (#823)
(cherry picked from commit 74ce73787d32bad6131af6411af2a8a80e5b57f0)
---
.../java/org/apache/solr/security/jwt/JWTVerificationkeyResolver.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTVerificationkeyResolver.java b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTVerificationkeyResolver.java
index dd7a54bde39..a9254c7d5d7 100644
--- a/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTVerificationkeyResolver.java
+++ b/solr/modules/jwt-auth/src/java/org/apache/solr/security/jwt/JWTVerificationkeyResolver.java
@@ -97,7 +97,7 @@ public class JWTVerificationkeyResolver implements VerificationKeyResolver {
} else {
throw new SolrException(
SolrException.ErrorCode.SERVER_ERROR,
- "Signature verifiction not supported for multiple issuers without 'iss' claim in token.");
+ "Signature verification not supported for multiple issuers without 'iss' claim in token.");
}
} else {
issuerConfig = issuerConfigs.get(tokenIssuer);
@@ -112,7 +112,7 @@ public class JWTVerificationkeyResolver implements VerificationKeyResolver {
} else {
throw new SolrException(
SolrException.ErrorCode.SERVER_ERROR,
- "Signature verifiction failed due to no configured issuer with id " + tokenIssuer);
+ "Signature verification failed due to no configured issuer with id " + tokenIssuer);
}
}
}
[solr] 02/02: SOLR-16181 Initialize the LogWatcher earlier in CoreContainer#load() (#543)
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit 43fc5e4bb3c19fa10d09881f098794132527550d
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Thu May 5 12:46:59 2022 +0200
SOLR-16181 Initialize the LogWatcher earlier in CoreContainer#load() (#543)
(cherry picked from commit 2cace80111908a33bfaed7a1fd57530ab2017e9b)
---
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/core/CoreContainer.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index af9731cf18d..74fbb624a45 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -22,6 +22,8 @@ Improvements
* SOLR-15045: `DistributedZkUpdateProcessor` now issues commits to local shards and remote shards in parallel,
halving the latency of synchronous commits (Michael Gibney)
+* SOLR-16181: Initialize the LogWatcher earlier in CoreContainer#load() (janhoy)
+
Optimizations
---------------------
* SOLR-16120: Optimise hl.fl expansion. (Christine Poerschke, David Smiley, Mike Drob)
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 e30ca217bbf..b04f824597d 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -696,6 +696,8 @@ public class CoreContainer {
log.debug("Loading cores into CoreContainer [instanceDir={}]", getSolrHome());
}
+ logging = LogWatcher.newRegisteredLogWatcher(cfg.getLogWatcherConfig(), loader);
+
ClusterEventProducerFactory clusterEventProducerFactory = new ClusterEventProducerFactory(this);
clusterEventProducer = clusterEventProducerFactory;
@@ -733,8 +735,6 @@ public class CoreContainer {
solrCores.load(loader);
- logging = LogWatcher.newRegisteredLogWatcher(cfg.getLogWatcherConfig(), loader);
-
StartupLoggingUtils.checkRequestLogging();
hostName = cfg.getNodeName();