MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 06:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-171206 WslProxy: Use correct logger category

Browse Source 
Previously, some messages were written with the category `#kotlinx.coroutines.CoroutineScope`

(cherry picked from commit 2d665f82654f3d2b1d50c0128de7019f7d754f44)

IJ-CR-150935

GitOrigin-RevId: ec0073f82e41c973886284f6cba0a57d720f1329
This commit is contained in:
Vladimir Lagunov
2024-12-04 18:25:51 +01:00
committed by intellij-monorepo-bot
parent 97b2653a4b
commit 1b51229ac7
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platform/wsl-impl/src/com/intellij/execution/wsl/WslProxy.kt
View File

@@ -3,7 +3,7 @@ package com.intellij.execution.wsl
import com.intellij.openapi.Disposable
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.diagnostic.thisLogger
import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.util.registry.Registry
import io.ktor.network.selector.ActorSelectorManager
import io.ktor.network.sockets.*
@@ -35,6 +35,8 @@ import kotlin.coroutines.coroutineContext
@ApiStatus.Internal
class WslProxy(distro: AbstractWslDistribution, private val applicationPort: Int) : Disposable {
private companion object {
private val LOG = logger<WslProxy>()
/**
* Server might not be opened yet. Since non-blocking Ktor API doesn't wait for it but throws exception instead, we retry
*/
@@ -44,7 +46,7 @@ class WslProxy(distro: AbstractWslDistribution, private val applicationPort: Int
}
catch (e: IOException) {
if (attemptRemains <= 0) throw e
thisLogger().warn("Can't connect to $host $port , will retry", e)
LOG.warn("Can't connect to $host $port , will retry", e)
delay(100)
}
return tryConnect(host, port, attemptRemains - 1)
@@ -155,15 +157,15 @@ class WslProxy(distro: AbstractWslDistribution, private val applicationPort: Int
private suspend fun clientConnected(linuxEgressPort: Int) {
val selector = ActorSelectorManager(scope.coroutineContext)
val winToLin = scope.async {
thisLogger().info("Connecting to WSL: $wslLinuxIp:$linuxEgressPort")
LOG.info("Connecting to WSL: $wslLinuxIp:$linuxEgressPort")
val socket = aSocket(selector).tcp().tryConnect(wslLinuxIp, linuxEgressPort)
thisLogger().info("Connected to WSL")
LOG.info("Connected to WSL")
socket
}
val winToWin = scope.async {
thisLogger().info("Connecting to app: $127.0.0.1:$applicationPort")
LOG.info("Connecting to app: $127.0.0.1:$applicationPort")
val socket = aSocket(ActorSelectorManager(scope.coroutineContext)).tcp().tryConnect("127.0.0.1", applicationPort)
thisLogger().info("Connected to app")
LOG.info("Connected to app")
socket
}
scope.launch {