Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add documentation for ssl-reload, change exception message in SslContextFactory 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2020-07-15 19:01:15 +10:00
parent c40ba69222
commit 0f7d99c3bf
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc
View File

@ -989,3 +989,15 @@ As a reminder, when configuring your includes/excludes, *excludes always win*.
Dumps can be configured as part of the `jetty.xml` configuration for your server.
Please see the documentation on the link:#jetty-dump-tool[Jetty Dump Tool] for more information.
==== SslContextFactory KeyStore Reload
Jetty can be configured to monitor the directory of the KeyStore file specified in the SslContextFactory, and reload the
SslContextFactory if any changes are detected to the KeyStore file.
If changes need to be done to other file such as the TrustStore file, this must be done before the change to the Keystore
file which will then trigger the `SslContextFactory` reload.
With the Jetty distribution this feature can be used by simply activating the `ssl-reload` startup module.
For embedded usage the `KeyStoreScanner` should be created given the `SslContextFactory` and added as a bean on the Server.

6
jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java
View File

@ -1132,7 +1132,7 @@ public class SslContextFactory extends AbstractLifeCycle implements Dumpable
synchronized (this)
{
if (_factory == null)
throw new IllegalStateException("reload failed SslContext unavailable");
throw new IllegalStateException("SslContextFactory reload failed");
return _factory._context;
}
@ -1536,7 +1536,7 @@ public class SslContextFactory extends AbstractLifeCycle implements Dumpable
synchronized (this)
{
if (_factory == null)
throw new IllegalStateException("reload failed KeyStore unavailable");
throw new IllegalStateException("SslContextFactory reload failed");
return _factory._keyStore;
}
@ -1560,7 +1560,7 @@ public class SslContextFactory extends AbstractLifeCycle implements Dumpable
synchronized (this)
{
if (_factory == null)
throw new IllegalStateException("reload failed TrustStore unavailable");
throw new IllegalStateException("SslContextFactory reload failed");
return _factory._trustStore;
}