[java-identity-provider] branch master updated: IDP-1181 Remove the LDAP connection pool failFast property
Rod Widdowson
rdw at steadingsoftware.com
Thu Oct 3 08:08:51 EDT 2019
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=decb2fa67e169140587f01c739f62b472970f61d
The following commit(s) were added to refs/heads/master by this push:
new decb2fa IDP-1181 Remove the LDAP connection pool failFast property
decb2fa is described below
commit decb2fa67e169140587f01c739f62b472970f61d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Sep 28 16:38:30 2019 +0100
IDP-1181 Remove the LDAP connection pool failFast property
https://issues.shibboleth.net/jira/browse/IDP-1181
Hard wire default to false where needed
---
idp-conf/src/main/resources/conf/attribute-resolver-full.xml | 3 +--
idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml | 3 +--
idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml | 2 +-
idp-conf/src/main/resources/conf/ldap.properties | 1 -
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/idp-conf/src/main/resources/conf/attribute-resolver-full.xml b/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
index d93a9d1..4e4801b 100644
--- a/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
+++ b/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
@@ -300,8 +300,7 @@
blockWaitTime="%{idp.pool.LDAP.blockWaitTime:PT3S}"
validatePeriodically="%{idp.pool.LDAP.validatePeriodically:true}"
validateTimerPeriod="%{idp.pool.LDAP.validatePeriod:PT5M}"
- expirationTime="%{idp.pool.LDAP.idleTime:PT10M}"
- failFastInitialize="%{idp.pool.LDAP.failFastInitialize:false}" />
+ expirationTime="%{idp.pool.LDAP.idleTime:PT10M}" />
</DataConnector>
-->
diff --git a/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml b/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
index 69154c0..f708543 100644
--- a/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
+++ b/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
@@ -87,8 +87,7 @@
blockWaitTime="%{idp.pool.LDAP.blockWaitTime:PT3S}"
validatePeriodically="%{idp.pool.LDAP.validatePeriodically:true}"
validateTimerPeriod="%{idp.pool.LDAP.validatePeriod:PT5M}"
- expirationTime="%{idp.pool.LDAP.idleTime:PT10M}"
- failFastInitialize="%{idp.pool.LDAP.failFastInitialize:false}" />
+ expirationTime="%{idp.pool.LDAP.idleTime:PT10M}"/>
</DataConnector>
</AttributeResolver>
diff --git a/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml b/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
index 5e7c5b1..44e1b60 100644
--- a/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
+++ b/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
@@ -54,7 +54,7 @@
p:poolConfig-ref="poolConfig"
p:pruneStrategy-ref="pruneStrategy"
p:validator-ref="searchValidator"
- p:failFastInitialize="%{idp.pool.LDAP.failFastInitialize:false}" />
+ p:failFastInitialize="false" />
<bean id="poolConfig" class="org.ldaptive.pool.PoolConfig"
p:minPoolSize="%{idp.pool.LDAP.minSize:3}"
p:maxPoolSize="%{idp.pool.LDAP.maxSize:10}"
diff --git a/idp-conf/src/main/resources/conf/ldap.properties b/idp-conf/src/main/resources/conf/ldap.properties
index 37b270e..c2bca67 100644
--- a/idp-conf/src/main/resources/conf/ldap.properties
+++ b/idp-conf/src/main/resources/conf/ldap.properties
@@ -60,4 +60,3 @@ idp.attribute.resolver.LDAP.searchFilter = (uid=$resolutionContext.princi
#idp.pool.LDAP.prunePeriod = PT5M
#idp.pool.LDAP.idleTime = PT10M
#idp.pool.LDAP.blockWaitTime = PT3S
-#idp.pool.LDAP.failFastInitialize = false
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list