BUG: introduced a deadlock

machinery/src/cloud/Cloud.go

@@ -278,15 +278,16 @@ func HandleLiveStreamHD(livestreamCursor *pubsub.QueueCursor, configuration *mod
 	} else {
 		log.Log.Info("HandleLiveStreamHD: Waiting for peer connections.")
 		for handshake := range communication.HandleLiveHDHandshake {
-			webrtc.CandidatesMutex.Lock()
 			log.Log.Info("HandleLiveStreamHD: setting up a peer connection.")
 			key := config.Key + "/" + handshake.Cuuid
+			webrtc.CandidatesMutex.Lock()
 			_, ok := webrtc.CandidateArrays[key]
 			if !ok {
 				webrtc.CandidateArrays[key] = make(chan string, 30)
 			}
-			webrtc.InitializeWebRTCConnection(configuration, communication, mqttClient, track, handshake, webrtc.CandidateArrays[key])
 			webrtc.CandidatesMutex.Unlock()
+			webrtc.InitializeWebRTCConnection(configuration, communication, mqttClient, track, handshake, webrtc.CandidateArrays[key])
+
 		}
 	}
 }

machinery/src/routers/mqtt/main.go

@@ -159,16 +159,16 @@ func MQTTListenerHandleLiveHDCandidates(mqttClient mqtt.Client, hubKey string, c
 		var candidate models.Candidate
 		json.Unmarshal(msg.Payload(), &candidate)
 		if candidate.CloudKey == config.Key {
-			webrtc.CandidatesMutex.Lock()
 			key := candidate.CloudKey + "/" + candidate.Cuuid
 			candidatesExists := false
 			var channel chan string
 			for !candidatesExists {
+				webrtc.CandidatesMutex.Lock()
 				channel, candidatesExists = webrtc.CandidateArrays[key]
+				webrtc.CandidatesMutex.Unlock()
 			}
 			log.Log.Info("MQTTListenerHandleLiveHDCandidates: " + string(msg.Payload()))
 			channel <- string(msg.Payload())
-			webrtc.CandidatesMutex.Unlock()
 		}
 	})
 }