From 7c881e3befd8299ec7156bc19c6d54eaffeda32f Mon Sep 17 00:00:00 2001 From: SvyatoslavScherbina Date: Fri, 14 Jun 2019 15:34:51 +0300 Subject: [PATCH] Avoid using internal server DNS-based heuristic by default (#3045) --- .../jetbrains/kotlin/konan/util/DependencyProcessor.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt index 58105bce151..171d5d2a319 100644 --- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt +++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/util/DependencyProcessor.kt @@ -282,17 +282,19 @@ internal object InternalServer { private val internalDomain = "labs.intellij.net" - val isAvailable by lazy { + val isAvailable: Boolean get() { val envKey = "KONAN_USE_INTERNAL_SERVER" val envValue = System.getenv(envKey) - when (envValue) { - "0" -> false + return when (envValue) { + null, "0" -> false "1" -> true - null -> checkAccessible() + "auto" -> isAccessible else -> error("unexpected environment: $envKey=$envValue") } } + private val isAccessible by lazy { checkAccessible() } + private fun checkAccessible() = try { if (!InetAddress.getLocalHost().canonicalHostName.endsWith(".$internalDomain")) { // Fast path: