From cad68898e29991430299432352a178eeec1dcc22 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Mon, 11 May 2020 15:42:01 +0200 Subject: [PATCH] build-in server: ability to disable it via VM options GitOrigin-RevId: e9e9668c863ae9742dbb4d8ff89f04e80289c653 --- .../src/org/jetbrains/ide/BuiltInServerManagerImpl.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/platform/built-in-server/src/org/jetbrains/ide/BuiltInServerManagerImpl.kt b/platform/built-in-server/src/org/jetbrains/ide/BuiltInServerManagerImpl.kt index 3ccfd19b0f57..747c77dd4585 100644 --- a/platform/built-in-server/src/org/jetbrains/ide/BuiltInServerManagerImpl.kt +++ b/platform/built-in-server/src/org/jetbrains/ide/BuiltInServerManagerImpl.kt @@ -31,11 +31,13 @@ import java.net.InetAddress import java.net.NetworkInterface import java.net.URLConnection import java.util.* +import java.util.concurrent.CompletableFuture import java.util.concurrent.Future import java.util.function.Consumer private const val PORTS_COUNT = 20 private const val PROPERTY_RPC_PORT = "rpc.port" +private const val PROPERTY_DISABLED = "idea.builtin.server.disabled" private val LOG = logger() @@ -123,6 +125,12 @@ class BuiltInServerManagerImpl : BuiltInServerManager() { } private fun startServerInPooledThread(): Future<*> { + if (SystemProperties.getBooleanProperty(PROPERTY_DISABLED, false)) { + return CompletableFuture().apply { + completeExceptionally(Throwable("Built-in server is disabled by `$PROPERTY_DISABLED` VM option")) + } + } + return StartupUtil.getServerFuture() .thenAcceptAsync(Consumer { mainServer -> try {