project version bump to 0.6.0, and bump kotest, tstl, typescript
This commit is contained in:
parent
a225b65901
commit
0398e2026d
11 changed files with 74 additions and 88 deletions
|
|
@ -50,9 +50,3 @@ suspend fun main() {
|
|||
}
|
||||
}
|
||||
}
|
||||
// Runtime.getRuntime().addShutdownHook(Thread {
|
||||
// webServer.stop()
|
||||
// })
|
||||
// launch {
|
||||
// }
|
||||
//}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import org.http4k.server.PolyHandler
|
|||
import org.http4k.server.Undertow
|
||||
import org.http4k.server.asServer
|
||||
|
||||
internal suspend fun webServer(
|
||||
internal fun webServer(
|
||||
tileServer: WebMapTileServer,
|
||||
wsServer: WebsocketServer,
|
||||
appProps: ApplicationProperties,
|
||||
|
|
|
|||
|
|
@ -98,10 +98,7 @@ class WebsocketServer {
|
|||
val clientJob = SupervisorJob(serverScope.coroutineContext.job)
|
||||
|
||||
serverScope.launch(CoroutineName("ws-client-$id") + clientJob) {
|
||||
// return serverScope.launch(CoroutineName("ws-client-$id")) {
|
||||
// supervisorScope {
|
||||
launch {
|
||||
|
||||
suspendCancellableCoroutine<WsStatus> { cont ->
|
||||
println("[ws-client] entering suspendCancellableCoroutine")
|
||||
|
||||
|
|
@ -138,11 +135,7 @@ class WebsocketServer {
|
|||
.onEach { msg ->
|
||||
println("[ws-client] sending message to $id")
|
||||
ws.send(WsMessage(msg))
|
||||
}
|
||||
.launchIn(this)
|
||||
}.launchIn(this)
|
||||
}
|
||||
|
||||
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue