mir/vinyldns
2
0
Fork 0
mirror of https://github.com/VinylDNS/vinyldns synced 2025-08-21 17:37:15 +00:00
Code Issues Releases Wiki Activity

commented the request-timeout config

Browse Source
This commit is contained in:
Jay07GIT 2024-08-12 18:06:53 +05:30
parent 59fd320a5a
commit d90ab4c319
No known key found for this signature in database
GPG Key ID: AC6B0308EFC79008
10 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/docker/api/application.conf
View File

@ -350,7 +350,10 @@ akka.http {
# The time period within which the TCP binding process must be completed.
# Set to `infinite` to disable.
bind-timeout = 5s
request-timeout = 60s
# A default request timeout is applied globally to all routes and can be configured using the
# akka.http.server.request-timeout setting (which defaults to 20 seconds).
# request-timeout = 60s
# Show verbose error messages back to the client
verbose-error-messages = on

4
modules/api/src/it/resources/application.conf
View File

@ -347,7 +347,9 @@ akka.http {
# The time period within which the TCP binding process must be completed.
# Set to `infinite` to disable.
bind-timeout = 5s
request-timeout = 60s
# A default request timeout is applied globally to all routes and can be configured using the
# akka.http.server.request-timeout setting (which defaults to 20 seconds).
# request-timeout = 60s
# Show verbose error messages back to the client
verbose-error-messages = on

7
modules/api/src/main/resources/application.conf
View File

@ -19,7 +19,7 @@ vinyldns {
shared-approved-types = ["A", "AAAA", "CNAME", "PTR", "TXT"]
# Batch change settings
batch-change-limit = 100
batch-change-limit = 1000
batch-change-limit = ${?BATCH_CHANGE_LIMIT}
manual-batch-review-enabled = true
manual-batch-review-enabled = ${?MANUAL_BATCH_REVIEW_ENABLED}
@ -366,7 +366,10 @@ akka.http {
# The time period within which the TCP binding process must be completed.
# Set to `infinite` to disable.
bind-timeout = 5s
request-timeout = 60s
# A default request timeout is applied globally to all routes and can be configured using the
# akka.http.server.request-timeout setting (which defaults to 20 seconds).
# request-timeout = 60s
# Show verbose error messages back to the client
verbose-error-messages = on

5
modules/api/src/universal/conf/application.conf
View File

@ -351,7 +351,10 @@ akka.http {
# The time period within which the TCP binding process must be completed.
# Set to `infinite` to disable.
bind-timeout = 5s
request-timeout = 60s
# A default request timeout is applied globally to all routes and can be configured using the
# akka.http.server.request-timeout setting (which defaults to 20 seconds).
# request-timeout = 60s
# Show verbose error messages back to the client
verbose-error-messages = on

4
modules/docs/src/main/mdoc/operator/config-api.md
View File

@ -990,7 +990,9 @@ dotted-hosts = {
# The time period within which the TCP binding process must be completed.
# Set to `infinite` to disable.
bind-timeout = 5s
request-timeout = 60s
# A default request timeout is applied globally to all routes and can be configured using the
# akka.http.server.request-timeout setting (which defaults to 20 seconds).
# request-timeout = 60s
# Show verbose error messages back to the client
verbose-error-messages = on

2
modules/portal/app/models/Meta.scala
View File

@ -32,7 +32,7 @@ object Meta {
Meta(
config.getOptional[String]("vinyldns.version").getOrElse("unknown"),
config.getOptional[Boolean]("shared-display-enabled").getOrElse(false),
config.getOptional[Int]("api.limits.batchchange-routing-max-items-limit").getOrElse(100),
config.getOptional[Int]("api.limits.batchchange-routing-max-items-limit").getOrElse(1000),
config.getOptional[Long]("default-ttl").getOrElse(7200L),
config.getOptional[Boolean]("manual-batch-review-enabled").getOrElse(false),
config.getOptional[Boolean]("scheduled-changes-enabled").getOrElse(false),

2
modules/portal/app/views/dnsChanges/dnsChangeNew.scala.html
View File

@ -329,7 +329,7 @@
<input type="file" id="batchChangeCsv" ng-model="csvInput" name="batchChangeCsv" class="batchChangeCsv" ng-change="uploadCSV(createBatchChangeForm.batchChangeCsv.$viewValue, batchChangeLimit )" batch-change-file>
<p><a href="https://www.vinyldns.io/portal/dns-changes#dns-change-csv-import" target="_blank" rel="noopener noreferrer">See documentation for sample CSV</a></p>
</div>
<p ng-if="newBatch.changes.length > batchChangeLimit">Limit reached. Cannot add more than {{batchChangeLimit}} records per DNS change.</p>
<p ng-if="newBatch.changes.length >= batchChangeLimit">Limit reached. Cannot add more than {{batchChangeLimit}} records per DNS change.</p>
</div>
<div class="panel-footer clearfix">
<div ng-if="formStatus=='pendingSubmit'" class="pull-right">

2
modules/portal/test/models/MetaSpec.scala
View File

@ -39,7 +39,7 @@ class MetaSpec extends Specification with Mockito {
}
"default to 1000 if batch-change-limit is not found" in {
val config = Map("vinyldns.version" -> "foo-bar")
Meta(Configuration.from(config)).batchChangeLimit must beEqualTo(100)
Meta(Configuration.from(config)).batchChangeLimit must beEqualTo(1000)
}
"get the default-ttl value in config" in {
val config = Map("default-ttl" -> 7210)

5
test/api/functional/application.conf
View File

@ -301,7 +301,10 @@ akka.http {
# The time period within which the TCP binding process must be completed.
# Set to `infinite` to disable.
bind-timeout = 5s
request-timeout = 60s
# A default request timeout is applied globally to all routes and can be configured using the
# akka.http.server.request-timeout setting (which defaults to 20 seconds).
# request-timeout = 60s
# Show verbose error messages back to the client
verbose-error-messages = on

6
test/api/integration/application.conf
View File

@ -359,7 +359,11 @@ akka.http {
# The time period within which the TCP binding process must be completed.
# Set to `infinite` to disable.
bind-timeout = 5s
request-timeout = 60s
# A default request timeout is applied globally to all routes and can be configured using the
# akka.http.server.request-timeout setting (which defaults to 20 seconds).
# request-timeout = 60s
# Show verbose error messages back to the client
verbose-error-messages = on
}