From 1402547f49bb7d4c6b6de6bc3632bcdcc6f670dd Mon Sep 17 00:00:00 2001 From: ekoby <7406535+ekoby@users.noreply.github.com> Date: Tue, 10 Nov 2020 17:12:54 -0500 Subject: [PATCH] make sure we stop all channels when context transitions to Disabled (#90) --- ziti/src/main/kotlin/org/openziti/impl/ZitiContextImpl.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ziti/src/main/kotlin/org/openziti/impl/ZitiContextImpl.kt b/ziti/src/main/kotlin/org/openziti/impl/ZitiContextImpl.kt index 41232f95..4a6ef660 100644 --- a/ziti/src/main/kotlin/org/openziti/impl/ZitiContextImpl.kt +++ b/ziti/src/main/kotlin/org/openziti/impl/ZitiContextImpl.kt @@ -90,10 +90,12 @@ internal class ZitiContextImpl(internal val id: Identity, enabled: Boolean) : Zi this._enabled = enabled launch { - statusCh.takeWhile {it != ZitiContext.Status.Disabled}.collect { + statusCh.collect { d { "${this@ZitiContextImpl} transitioned to $it" } + if (it == ZitiContext.Status.Disabled) { + stop() + } } - stop() } runServiceUpdates(login())