From aa5dce65bbd4d12701b91e5e52ea9b0952662b9b Mon Sep 17 00:00:00 2001 From: Khalid Shakir Date: Sat, 14 Jan 2017 01:45:42 -0500 Subject: [PATCH] Changed "webservice.timeout" to "webservice.binding-timeout". Also no longer auto-merging the changelog, as we couldn't quite get auto-merging to work with our flow, requiring further manual intervention anyway. --- .gitattributes | 3 --- CHANGELOG.md | 5 ++--- core/src/main/resources/reference.conf | 2 +- engine/src/main/scala/cromwell/server/CromwellServer.scala | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitattributes b/.gitattributes index 49c97c85f..9fcf38aa0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,3 @@ -# This file can always be added to, line additions should never collide. -CHANGELOG.MD merge=union - # These files are text and should be normalized (Convert crlf => lf) *.scala text *.MD text diff --git a/CHANGELOG.md b/CHANGELOG.md index 94edff1e4..8dcead856 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,8 @@ * Added ability to override the default zone(s) used by JES via the config structure by setting `genomics.default-zones` in the JES configuration * Added support for new WDL functions: * `length: (Array[X]) => Integer` - report the length of the specified array -* The cromwell server TCP binding timeout is now configurable via the config key `webservice.timeout`, defaulted to the - previous value `5s` (five seconds) via the reference.conf. - * `length: (Array[X]) => Integer` - report the length of the specified array. +* The cromwell server TCP binding timeout is now configurable via the config key `webservice.binding-timeout`, defaulted + to the previous value `5s` (five seconds) via the reference.conf. ### Database schema changes * Added CUSTOM_LABELS as a field of WORKFLOW_STORE_ENTRY, to store workflow store entries. diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf index b60bac4ec..32feb16d3 100644 --- a/core/src/main/resources/reference.conf +++ b/core/src/main/resources/reference.conf @@ -8,7 +8,7 @@ webservice { port = 8000 interface = 0.0.0.0 - timeout = 5s + binding-timeout = 5s instance.name = "reference" } diff --git a/engine/src/main/scala/cromwell/server/CromwellServer.scala b/engine/src/main/scala/cromwell/server/CromwellServer.scala index ac47e1ef6..56f87ef87 100644 --- a/engine/src/main/scala/cromwell/server/CromwellServer.scala +++ b/engine/src/main/scala/cromwell/server/CromwellServer.scala @@ -31,7 +31,7 @@ object CromwellServer { val interface = webserviceConf.getString("interface") val port = webserviceConf.getInt("port") - val timeout = webserviceConf.as[FiniteDuration]("timeout") + val timeout = webserviceConf.as[FiniteDuration]("binding-timeout") val futureBind = service.bind(interface, port)(implicitly, timeout, actorSystem, implicitly) futureBind andThen { case Success(_) =>