mirrors/nock-nock
0
0
Fork 0
mirror of https://github.com/afollestad/nock-nock.git synced 2025-08-09 09:28:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve two crashes

Browse source
This commit is contained in:
Aidan Follestad 2019-01-26 14:55:06 -08:00
commit 3e5b1d4d8e
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
engine/src/main/java/com/afollestad/nocknock/engine/validation/ValidationExecutor.kt
View file

@ -36,6 +36,7 @@ import okhttp3.Response
import org.jetbrains.annotations.TestOnly import org.jetbrains.annotations.TestOnly
import java.net.SocketTimeoutException import java.net.SocketTimeoutException
import java.util.concurrent.TimeUnit.MILLISECONDS import java.util.concurrent.TimeUnit.MILLISECONDS
import kotlin.math.max
import timber.log.Timber.d as log import timber.log.Timber.d as log
/** @author Aidan Follestad (@afollestad) */ /** @author Aidan Follestad (@afollestad) */
@ -154,21 +155,23 @@ class RealValidationExecutor(
check(site.id != 0L) { "Cannot schedule validations for jobs with no ID." } check(site.id != 0L) { "Cannot schedule validations for jobs with no ID." }
val siteSettings = site.settings val siteSettings = site.settings
requireNotNull(siteSettings) { "Site settings must be populated." } requireNotNull(siteSettings) { "Site settings must be populated." }
check(siteSettings.networkTimeout > 0) { "Network timeout not set for site ${site.id}" }
log("performValidation(${site.id}) - GET ${site.url}") log("performValidation(${site.id}) - GET ${site.url}")
val request = Request.Builder() val request = Request.Builder()
.apply { .apply {
url(site.url) url(site.url)
get() get()
site.headers.forEach { header -> site.headers
addHeader(header.key, header.value) .filter { header -> header.key.isNotNullOrEmpty() }
} .forEach { header ->
addHeader(header.key, header.value)
}
} }
.build() .build()
return try { return try {
val clientWithTimeout = clientTimeoutChanger(okHttpClient, siteSettings.networkTimeout) val timeout = max(siteSettings.networkTimeout, 1)
val clientWithTimeout = clientTimeoutChanger(okHttpClient, timeout)
val client = if (siteSettings.certificate.isNotNullOrEmpty()) { val client = if (siteSettings.certificate.isNotNullOrEmpty()) {
sslManager.clientForCertificate( sslManager.clientForCertificate(
certUri = siteSettings.certificate!!, certUri = siteSettings.certificate!!,