controllers/room.go

@@ -3,15 +3,13 @@ package controllers
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
+	"github.com/gin-gonic/gin"
 	"io"
 	"net/http"
-	"time"
-
-	"github.com/gin-gonic/gin"
 	"sourcecode.social/greatape/goldgorilla/models"
 	"sourcecode.social/greatape/goldgorilla/models/dto"
 	"sourcecode.social/greatape/goldgorilla/repositories"
+	"time"
 )
 
 type RoomController struct {
@@ -45,91 +43,20 @@ func (c *RoomController) CreatePeer(ctx *gin.Context) {
 	c.helper.Response(ctx, struct{}{}, http.StatusNoContent)
 }
 
-func (c *RoomController) RetryAddICECandidate(ctx *gin.Context, tries int) {
+func (c *RoomController) AddICECandidate(ctx *gin.Context) {
-	time.Sleep(1 * time.Second)
-	tries++
-	fmt.Println("----RetryAddICECandidate----")
 	var reqModel dto.AddPeerICECandidateReqModel
 	badReqSt := 400
-	err1 := ctx.ShouldBindJSON(&reqModel)
+	if err := ctx.ShouldBindJSON(&reqModel); c.helper.HandleIfErr(ctx, err, &badReqSt) {
-	// if err1 != nil && tries < 3 {
-	// 	// var reqGlobal interface{}
-
-	// 	// err2 := ctx.ShouldBindJSON(&reqGlobal)
-	// 	// fmt.Println("Err2: ", err2)
-	// 	// fmt.Println("reqGlobal: ", reqGlobal)
-	// 	c.RetryAddICECandidate(ctx, tries)
-	// 	return
-
-	// }
-	if err1 != nil {
-		c.helper.HandleIfErr(ctx, err1, &badReqSt)
-		fmt.Println("Err1: ", err1)
 		return
 	}
-	// if err := ctx.ShouldBindJSON(&reqModel); c.helper.HandleIfErr(ctx, err, &badReqSt) {
-	// 	fmt.Println("Err1: ", err)
-	// 	time.Sleep(1 * time.Second)
-	// 	c.RetryAddICECandidate(ctx, tries)
-	// 	return
-	// }
 	if !reqModel.Validate() {
 		c.helper.ResponseUnprocessableEntity(ctx)
-		fmt.Println("Validate")
 		return
 	}
 	err := c.repo.AddPeerIceCandidate(reqModel.RoomId, reqModel.ID, reqModel.ICECandidate)
-	if err != nil && tries < 3 {
+	if c.helper.HandleIfErr(ctx, err, nil) {
-		c.RetryAddICECandidate(ctx, tries)
 		return
 	}
-	if err != nil {
-		c.helper.HandleIfErr(ctx, err, &badReqSt)
-		fmt.Println("Err: ", err)
-		return
-	}
-	// if c.helper.HandleIfErr(ctx, err, nil) {
-	// 	fmt.Println("Err2: ", err)
-	// 	time.Sleep(1 * time.Second)
-	// 	c.RetryAddICECandidate(ctx, tries)
-	// 	return
-	// }
-	c.helper.Response(ctx, struct{}{}, http.StatusNoContent)
-}
-
-func (c *RoomController) AddICECandidate(ctx *gin.Context) {
-	fmt.Println("----AddICECandidate----")
-	// bd, _ := io.ReadAll(ctx.Request.Body)
-	// fmt.Println("bd: ", string(bd))
-	var reqModel dto.AddPeerICECandidateReqModel
-	// badReqSt := 400
-	err1 := ctx.ShouldBindJSON(&reqModel)
-	if err1 != nil {
-		// c.RetryAddICECandidate(ctx, 0)
-		return
-	}
-	// if err := ctx.ShouldBindJSON(&reqModel); c.helper.HandleIfErr(ctx, err, &badReqSt) {
-	// 	fmt.Println("Err1: ", err)
-	// 	time.Sleep(1 * time.Second)
-	// 	c.AddICECandidate(ctx)
-	// 	return
-	// }
-	if !reqModel.Validate() {
-		c.helper.ResponseUnprocessableEntity(ctx)
-		fmt.Println("Validate")
-		return
-	}
-	err := c.repo.AddPeerIceCandidate(reqModel.RoomId, reqModel.ID, reqModel.ICECandidate)
-	if err != nil {
-		c.RetryAddICECandidate(ctx, 0)
-		return
-	}
-	// if c.helper.HandleIfErr(ctx, err, nil) {
-	// 	fmt.Println("Err2: ", err)
-	// 	time.Sleep(1 * time.Second)
-	// 	c.AddICECandidate(ctx)
-	// 	return
-	// }
 	c.helper.Response(ctx, struct{}{}, http.StatusNoContent)
 }
 

main.go

@@ -6,10 +6,10 @@ import (
 )
 
 func main() {
-	svcAddr := flag.String("svc-addr", "http://localhost:8080", "service baseurl to register in logjam ( shouldn't end with / )")
+	svcAddr := flag.String("svc-addr", "", "service baseurl to register in logjam ( shoudln't end with / )")
-	src := flag.String("src", "localhost:8080", "listenHost:listenPort")
+	src := flag.String("src", ":8080", "listenhost:listenPort")
-	logjamBaseUrl := flag.String("logjam-base-url", "http://localhost:8090", "logjam base url(shouldn't end with /)")
+	logjamBaseUrl := flag.String("logjam-base-url", "https://example.com", "logjam base url(shouldn't end with /)")
-	targetRoom := flag.String("targetRoom", "test-room", "target room")
+	targetRoom := flag.String("targetRoom", "testyroom", "target room")
 
 	flag.Parse()