diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-03-14 09:24:18 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-03-14 09:25:05 +0100 |
| commit | 59c8cf3ff2a4688562c73823db9e3df71b70cc5e (patch) | |
| tree | 8c9acf7b673fe42ddf59a1687818db9b93bdcc8b /jdisc_http_service | |
| parent | 820a730d7efede2a84133170639d624f7939e358 (diff) | |
Add back stopTimeout to connector config
Diffstat (limited to 'jdisc_http_service')
| -rw-r--r-- | jdisc_http_service/abi-spec.json | 2 | ||||
| -rw-r--r-- | jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/jdisc_http_service/abi-spec.json b/jdisc_http_service/abi-spec.json index 9b55341211c..04e6d22a445 100644 --- a/jdisc_http_service/abi-spec.json +++ b/jdisc_http_service/abi-spec.json @@ -34,6 +34,7 @@ "public com.yahoo.jdisc.http.ConnectorConfig$Builder acceptQueueSize(int)", "public com.yahoo.jdisc.http.ConnectorConfig$Builder reuseAddress(boolean)", "public com.yahoo.jdisc.http.ConnectorConfig$Builder idleTimeout(double)", + "public com.yahoo.jdisc.http.ConnectorConfig$Builder stopTimeout(double)", "public com.yahoo.jdisc.http.ConnectorConfig$Builder tcpKeepAliveEnabled(boolean)", "public com.yahoo.jdisc.http.ConnectorConfig$Builder tcpNoDelay(boolean)", "public com.yahoo.jdisc.http.ConnectorConfig$Builder throttling(com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder)", @@ -195,6 +196,7 @@ "public int acceptQueueSize()", "public boolean reuseAddress()", "public double idleTimeout()", + "public double stopTimeout()", "public boolean tcpKeepAliveEnabled()", "public boolean tcpNoDelay()", "public com.yahoo.jdisc.http.ConnectorConfig$Throttling throttling()", diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def index 5d9b9d2cc0d..7735420d803 100644 --- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def +++ b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def @@ -28,6 +28,10 @@ reuseAddress bool default=true # The maximum idle time for a connection, which roughly translates to the Socket.setSoTimeout(int). idleTimeout double default=180.0 +# DEPRECATED - Ignored, no longer in use +stopTimeout double default = 30.0 +# TODO Vespa 8 Remove stop timeout + # Whether or not to have socket keep alive turned on. tcpKeepAliveEnabled bool default=false |