make sure we stop all channels when context transitions to Disabled (#90

)
openziti · Nov 10, 2020 · 1402547 · 1402547
1 parent 4eed4f8
commit 1402547
Showing 1 changed file with 4 additions and 2 deletions.
diff --git 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())