Merge pull request #179 from pion/sfu_keys

Fix bad SFU mid key Former-commit-id: fe778dc
ionorg · May 14, 2020 · 7c3003a · 7c3003a
2 parents 710bcbe + ff9d6c7
commit 7c3003a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cmd/sfu/main.go b/cmd/sfu/main.go
@@ -80,6 +80,6 @@ func main() {
 
 	rpcID := serviceNode.GetRPCChannel()
 	eventID := serviceNode.GetEventChannel()
-	sfu.Init(conf.Global.Dc, serviceNode.NodeInfo().ID, rpcID, eventID, conf.Nats.URL)
+	sfu.Init(conf.Global.Dc, serviceNode.NodeInfo().Info["id"], rpcID, eventID, conf.Nats.URL)
 	select {}
 }
diff --git a/pkg/node/sfu/init.go b/pkg/node/sfu/init.go
@@ -29,8 +29,13 @@ func Init(dcID, nodeID, rpcID, eventID, natsURL string) {
 func checkRTC() {
 	log.Infof("SFU.checkRTC start")
 	go func() {
-		for mid := range rtc.CleanChannel {
-			broadcaster.Say(proto.SFUStreamRemove, util.Map("mid", mid))
+		for mInfo := range rtc.CleanChannel {
+			mediaInfo, err := proto.ParseMediaInfo(mInfo)
+			if err != nil {
+				log.Errorf("Error parsing media info %v", mInfo)
+				continue
+			}
+			broadcaster.Say(proto.SFUStreamRemove, util.Map("mid", mediaInfo.MID))
 		}
 	}()
 }