Skip to content

Commit 65e4b8d

Browse files
committed
Fix launch-dev-server script to work also from VS Code
1 parent 4e7709a commit 65e4b8d

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

components/ide/jetbrains/backend-plugin/launch-dev-server.sh

+7
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,11 @@ fi
3232
export JB_DEV=true
3333
export JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:0"
3434

35+
# Set default config and system directories under /workspace to preserve between restarts
36+
export IJ_HOST_CONFIG_BASE_DIR=/workspace/.config/JetBrains
37+
export IJ_HOST_SYSTEM_BASE_DIR=/workspace/.cache/JetBrains
38+
39+
# Enable host status endpoint
40+
export CWM_HOST_STATUS_OVER_HTTP_TOKEN=gitpod
41+
3542
$TEST_BACKEND_DIR/bin/remote-dev-server.sh run $TEST_DIR

components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/services/ControllerStatusService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import java.net.http.HttpResponse
1717
import java.time.Duration
1818

1919
object ControllerStatusService {
20-
private val port = BuiltInServerManager.getInstance().port
2120
private val cwmToken = System.getenv("CWM_HOST_STATUS_OVER_HTTP_TOKEN")
2221
private val httpClient = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.ALWAYS)
2322
.connectTimeout(Duration.ofSeconds(2))
@@ -33,6 +32,7 @@ object ControllerStatusService {
3332
suspend fun fetch(): ControllerStatus =
3433
@Suppress("MagicNumber")
3534
retry(3) {
35+
val port = BuiltInServerManager.getInstance().waitForStart().port
3636
val httpRequest = HttpRequest.newBuilder()
3737
.uri(URI.create("http://localhost:$port/codeWithMe/unattendedHostStatus?token=$cwmToken"))
3838
.header("Content-Type", "application/json")

0 commit comments

Comments
 (0)