fix: return error if unable to lock

Author: tituschewxj

apps/matching-service/handlers/responses.go

@@ -18,7 +18,7 @@ func sendTimeoutResponse(ws *websocket.Conn) {
 	}
 }
 
-func sendRejectionResponse(ws *websocket.Conn) {
+func sendDuplicateUserRejectionResponse(ws *websocket.Conn) {
 	if err := ws.WriteJSON(models.MatchRejected{
 		Type:    "match_rejected",
 		Message: "You are already in a matchmaking queue. Please disconnect before reconnecting.",
@@ -27,6 +27,15 @@ func sendRejectionResponse(ws *websocket.Conn) {
 	}
 }
 
+func sendDefaultRejectionResponse(ws *websocket.Conn) {
+	if err := ws.WriteJSON(models.MatchRejected{
+		Type:    "match_rejected",
+		Message: "An unexpected error occurred. Please try again later.",
+	}); err != nil {
+		log.Printf("write error: %v", err)
+	}
+}
+
 // Send message to matched user
 func sendMatchFoundResponse(ws *websocket.Conn, username string, result models.MatchQuestionFound) {
 	if err := ws.WriteJSON(result); err != nil {

apps/matching-service/handlers/websocket.go

@@ -124,9 +124,11 @@ func waitForResult(ws *websocket.Conn, userCtx, timeoutCtx context.Context, matc
 		if !ok {
 			return
 		}
+		log.Printf("Error occured performing matching: %v", err)
 		if errors.Is(err, models.ExistingUserError) {
-			sendRejectionResponse(ws)
+			sendDuplicateUserRejectionResponse(ws)
 		} else {
+			sendDefaultRejectionResponse(ws)
 			cleanUpUser(username)
 		}
 		return

apps/matching-service/processes/performmatches.go

@@ -24,6 +24,7 @@ func PerformMatching(rdb *redis.Client, matchRequest models.MatchRequest, ctx co
 	// Obtain lock with retry
 	lock, err := servers.ObtainRedisLock(ctx)
 	if err != nil {
+		errorChan <- err
 		return
 	}
 	defer lock.Release(ctx)