Merge pull request #27 from cirnum/bug/trim-server-url

manojown · web-flow · commit 847fc62c5e0f · 2023-08-09T14:48:15.000+05:30
trim server url to remove last slash and space
diff --git a/server/app/controllers/server.go b/server/app/controllers/server.go
@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"context"
+	"strings"
 	"sync"
 
 	_ "github.com/cirnum/loadtester/server/app/models"
@@ -60,6 +61,9 @@ func AddServer(c *fiber.Ctx) error {
 	}
 
 	serverPayload.UserID = c.Locals("userId").(string)
+	serverPayload.IP = strings.Trim(serverPayload.IP, " /")
+	serverPayload.Enabled = true
+
 	if pkgUtils.SendMasterIp(serverPayload.IP) {
 		serverPayload.Active = true
 	}
diff --git a/server/pkg/utils/server.go b/server/pkg/utils/server.go
@@ -33,6 +33,7 @@ const (
 )
 
 func SendMasterIp(publicIp string) bool {
+	publicIp = strings.Trim(publicIp, " /")
 	var url string
 	hostDetails := &reqModels.MasterDetails{
 		Address: configs.ConfigProvider.HostUrl,

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package controllers`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+ "strings"`
`5`	`6`	`"sync"`
`6`	`7`
`7`	`8`	`_ "github.com/cirnum/loadtester/server/app/models"`
`@@ -60,6 +61,9 @@ func AddServer(c *fiber.Ctx) error {`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`serverPayload.UserID = c.Locals("userId").(string)`
	`64`	`+ serverPayload.IP = strings.Trim(serverPayload.IP, " /")`
	`65`	`+ serverPayload.Enabled = true`
	`66`	`+`
`63`	`67`	`if pkgUtils.SendMasterIp(serverPayload.IP) {`
`64`	`68`	`serverPayload.Active = true`
`65`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ const (`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`func SendMasterIp(publicIp string) bool {`
	`36`	`+ publicIp = strings.Trim(publicIp, " /")`
`36`	`37`	`var url string`
`37`	`38`	`hostDetails := &reqModels.MasterDetails{`
`38`	`39`	`Address: configs.ConfigProvider.HostUrl,`