diff options
| author | gjoranv <gjoranv@gmail.com> | 2017-04-18 10:47:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-18 10:47:14 +0200 |
| commit | 4da516e6afbac36f1c80d5e28a491748751ffff0 (patch) | |
| tree | 297e9954cbd06eea82f7f050b87962aa4bb132b1 /jdisc_http_service | |
| parent | 3c5c151fb804b17c29d1ad1cfa4e090bda820bbb (diff) | |
| parent | 7833af2e9ff244bbf9af0f0773191e62597ca63b (diff) | |
Merge pull request #2179 from yahoo/bjorncs/use-seconds-for-jetty-timeouts
Change soLingerTime unit from milliseconds to seconds
Diffstat (limited to 'jdisc_http_service')
| -rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java | 7 | ||||
| -rw-r--r-- | jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java index 87327bc217e..1be7d26d39f 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java @@ -104,7 +104,12 @@ public class ConnectorFactory { connector.setName(connectorConfig.name()); connector.setAcceptQueueSize(connectorConfig.acceptQueueSize()); connector.setReuseAddress(connectorConfig.reuseAddress()); - connector.setSoLingerTime(connectorConfig.soLingerTime()); + double soLingerTimeSeconds = connectorConfig.soLingerTime(); + if (soLingerTimeSeconds == -1) { + connector.setSoLingerTime(-1); + } else { + connector.setSoLingerTime((int)(soLingerTimeSeconds * 1000.0)); + } connector.setIdleTimeout((long)(connectorConfig.idleTimeout() * 1000.0)); connector.setStopTimeout((long)(connectorConfig.stopTimeout() * 1000.0)); return connector; 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 433508b0b9f..afe57e33245 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 @@ -25,8 +25,8 @@ acceptQueueSize int default=0 # Whether the server socket reuses addresses. reuseAddress bool default=true -# The linger time in milliseconds. Use -1 to disable. -soLingerTime int default=-1 +# The linger time in seconds. Use -1.0 to disable. +soLingerTime double default=-1.0 # The maximum idle time for a connection, which roughly translates to the Socket.setSoTimeout(int). idleTimeout double default=180.0 |