Skip to content

[JetBains] Fix to continuously observe ports while Gitpod Port Forwarding Service is active #14628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2022
Merged

[JetBains] Fix to continuously observe ports while Gitpod Port Forwarding Service is active #14628

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions ...ugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/GitpodPortForwardingServiceImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import com.intellij.openapi.diagnostic.thisLogger
import com.intellij.remoteDev.util.onTerminationOrNow
import com.intellij.ui.RowIcon
import com.intellij.util.application
import com.jetbrains.rd.framework.util.launch
import com.jetbrains.rd.platform.codeWithMe.portForwarding.*
import com.jetbrains.rd.util.URI
import com.jetbrains.rd.util.lifetime.Lifetime
Expand All @@ -22,10 +23,13 @@ import io.gitpod.supervisor.api.StatusServiceGrpc
import io.grpc.stub.ClientCallStreamObserver
import io.grpc.stub.ClientResponseObserver
import io.ktor.utils.io.*
import kotlinx.coroutines.cancel
import kotlinx.coroutines.delay
import kotlinx.coroutines.future.asDeferred
import kotlinx.coroutines.isActive
import org.apache.http.client.utils.URIBuilder
import java.util.*
import java.util.concurrent.CompletableFuture
import java.util.concurrent.TimeUnit

@Suppress("UnstableApiUsage")
class GitpodPortForwardingServiceImpl : GitpodPortForwardingService {
Expand All @@ -46,22 +50,25 @@ class GitpodPortForwardingServiceImpl : GitpodPortForwardingService {
observePortsListWhileProjectIsOpen()
}

private fun observePortsListWhileProjectIsOpen() = application.executeOnPooledThread {
lifetime.executeIfAlive {
private fun observePortsListWhileProjectIsOpen() = lifetime.launch {
while (isActive) {
try {
observePortsList().get()
observePortsList().asDeferred().await()
} catch (throwable: Throwable) {
when (throwable) {
is InterruptedException, is CancellationException -> lifetime.terminate()
else -> thisLogger().error(
"gitpod: Got an error while trying to get ports list from Supervisor. " +
"Going to try again in a second.",
throwable
)
is InterruptedException, is CancellationException -> {
cancel("gitpod: Stopped observing ports list due to an expected interruption.")
}
else -> {
thisLogger().warn(
"gitpod: Got an error while trying to get ports list from Supervisor. " +
"Going to try again in a second.",
throwable
)
delay(1000)
}
}
}

TimeUnit.SECONDS.sleep(1)
}
}

Expand All @@ -75,7 +82,7 @@ class GitpodPortForwardingServiceImpl : GitpodPortForwardingService {
val portsStatusResponseObserver = object :
ClientResponseObserver<Status.PortsStatusRequest, Status.PortsStatusResponse> {
override fun beforeStart(request: ClientCallStreamObserver<Status.PortsStatusRequest>) {
lifetime.onTerminationOrNow { request.cancel("gitpod: Project terminated.", null) }
lifetime.onTerminationOrNow { request.cancel("gitpod: Service lifetime terminated.", null) }
}

override fun onNext(response: Status.PortsStatusResponse) {
Expand Down