fix bug that prevented publishing twice to the same path (#1470) (#1469)

bluenviron · Feb 14, 2023 · f1455a6 · f1455a6
1 parent 19b06f9
commit f1455a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/internal/core/path.go b/internal/core/path.go
@@ -510,6 +510,9 @@ func (pa *path) run() {
 		}
 	}()
 
+	// call before destroying context
+	pa.parent.onPathClose(pa)
+
 	pa.ctxCancel()
 
 	pa.onDemandStaticSourceReadyTimer.Stop()
@@ -548,8 +551,6 @@ func (pa *path) run() {
 	}
 
 	pa.log(logger.Debug, "destroyed (%v)", err)
-
-	pa.parent.onPathClose(pa)
 }
 
 func (pa *path) shouldClose() bool {

diff --git a/internal/core/path_manager.go b/internal/core/path_manager.go
@@ -364,7 +364,7 @@ func (pm *pathManager) pathSourceReady(pa *path) {
 	select {
 	case pm.chPathSourceReady <- pa:
 	case <-pm.ctx.Done():
-	case <-pa.ctx.Done(): // in case pathManager is closing the path
+	case <-pa.ctx.Done(): // in case pathManager is blocked by path.wait()
 	}
 }
 
@@ -373,7 +373,7 @@ func (pm *pathManager) pathSourceNotReady(pa *path) {
 	select {
 	case pm.chPathSourceNotReady <- pa:
 	case <-pm.ctx.Done():
-	case <-pa.ctx.Done(): // in case pathManager is closing the path
+	case <-pa.ctx.Done(): // in case pathManager is blocked by path.wait()
 	}
 }
 
@@ -382,7 +382,7 @@ func (pm *pathManager) onPathClose(pa *path) {
 	select {
 	case pm.chPathClose <- pa:
 	case <-pm.ctx.Done():
-	case <-pa.ctx.Done(): // in case pathManager is closing the path
+	case <-pa.ctx.Done(): // in case pathManager is blocked by path.wait()
 	}
 }