libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Merge pull request #2220 from mposolda/master

Browse source 
KEYCLOAK-2436 Better defaults
This commit is contained in:
Marek Posolda 2016-02-11 16:21:42 +01:00
commit b234db4b34
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
docbook/auth-server-docs/reference/en/en-US/modules/server-installation.xml
View file

@ -396,7 +396,7 @@ bin/add-user.[sh|bat] -r master -u <username> -p <password>
<term>connection-pool-size</term> <term>connection-pool-size</term>
<listitem> <listitem>
<para> <para>
How many connections can be in the pool (200 by default). How many connections can be in the pool (128 by default).
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -404,7 +404,7 @@ bin/add-user.[sh|bat] -r master -u <username> -p <password>
<term>max-pooled-per-route</term> <term>max-pooled-per-route</term>
<listitem> <listitem>
<para> <para>
How many connections can be pooled per host (100 by default). How many connections can be pooled per host (64 by default).
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -412,7 +412,7 @@ bin/add-user.[sh|bat] -r master -u <username> -p <password>
<term>connection-ttl-millis</term> <term>connection-ttl-millis</term>
<listitem> <listitem>
<para> <para>
Maximum connection time to live in milliseconds Maximum connection time to live in milliseconds. Not set by default.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@ -420,7 +420,8 @@ bin/add-user.[sh|bat] -r master -u <username> -p <password>
<term>max-connection-idle-time-millis</term> <term>max-connection-idle-time-millis</term>
<listitem> <listitem>
<para> <para>
Maximum time the connection might stay idle in the connection pool. Will start background cleaner thread if set (by default it's not set) Maximum time the connection might stay idle in the connection pool (900 seconds by default). Will start background cleaner thread of Apache HTTP client.
Set to -1 to disable this checking and the background thread.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>

6
services/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java
View file

@ -119,10 +119,10 @@ public class DefaultHttpClientFactory implements HttpClientFactory {
if (httpClient == null) { if (httpClient == null) {
long socketTimeout = config.getLong("socket-timeout-millis", -1L); long socketTimeout = config.getLong("socket-timeout-millis", -1L);
long establishConnectionTimeout = config.getLong("establish-connection-timeout-millis", -1L); long establishConnectionTimeout = config.getLong("establish-connection-timeout-millis", -1L);
int maxPooledPerRoute = config.getInt("max-pooled-per-route", 100); int maxPooledPerRoute = config.getInt("max-pooled-per-route", 64);
int connectionPoolSize = config.getInt("connection-pool-size", 200); int connectionPoolSize = config.getInt("connection-pool-size", 128);
long connectionTTL = config.getLong("connection-ttl-millis", -1L); long connectionTTL = config.getLong("connection-ttl-millis", -1L);
long maxConnectionIdleTime = config.getLong("max-connection-idle-time-millis", -1L); long maxConnectionIdleTime = config.getLong("max-connection-idle-time-millis", 900000L);
boolean disableCookies = config.getBoolean("disable-cookies", true); boolean disableCookies = config.getBoolean("disable-cookies", true);
String clientKeystore = config.get("client-keystore"); String clientKeystore = config.get("client-keystore");
String clientKeystorePassword = config.get("client-keystore-password"); String clientKeystorePassword = config.get("client-keystore-password");

6
services/src/main/java/org/keycloak/connections/httpclient/HttpClientBuilder.java
View file

@ -92,11 +92,11 @@ public class HttpClientBuilder {
protected boolean disableTrustManager; protected boolean disableTrustManager;
protected HostnameVerificationPolicy policy = HostnameVerificationPolicy.WILDCARD; protected HostnameVerificationPolicy policy = HostnameVerificationPolicy.WILDCARD;
protected SSLContext sslContext; protected SSLContext sslContext;
protected int connectionPoolSize = 200; protected int connectionPoolSize = 128;
protected int maxPooledPerRoute = 100; protected int maxPooledPerRoute = 64;
protected long connectionTTL = -1; protected long connectionTTL = -1;
protected TimeUnit connectionTTLUnit = TimeUnit.MILLISECONDS; protected TimeUnit connectionTTLUnit = TimeUnit.MILLISECONDS;
protected long maxConnectionIdleTime = -1; protected long maxConnectionIdleTime = 900000;
protected TimeUnit maxConnectionIdleTimeUnit = TimeUnit.MILLISECONDS; protected TimeUnit maxConnectionIdleTimeUnit = TimeUnit.MILLISECONDS;
protected HostnameVerifier verifier = null; protected HostnameVerifier verifier = null;
protected long socketTimeout = -1; protected long socketTimeout = -1;