Use gin query query for logs

F1bonacc1 · Feb 27, 2023 · 1e90fd7 · 1e90fd7
1 parent 4e35715
commit 1e90fd7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/api/routes.go b/src/api/routes.go
@@ -46,7 +46,7 @@ func InitRoutes(useLogger bool) *gin.Engine {
 	r.POST("/process/restart/:name", RestartProcess)
 
 	//websocket
-	r.GET("/process/logs/ws/:name/:endOffset/:follow", HandleLogsStream)
+	r.GET("/process/logs/ws", HandleLogsStream)
 
 	return r
 }
diff --git a/src/api/ws_api.go b/src/api/ws_api.go
@@ -13,9 +13,9 @@ import (
 var upgrader = websocket.Upgrader{}
 
 func HandleLogsStream(c *gin.Context) {
-	procName := c.Param("name")
-	follow := c.Param("follow") == "true"
-	endOffset, err := strconv.Atoi(c.Param("endOffset"))
+	procName := c.Query("name")
+	follow := c.Query("follow") == "true"
+	endOffset, err := strconv.Atoi(c.Query("offset"))
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return

diff --git a/src/client/logs.go b/src/client/logs.go
@@ -13,7 +13,7 @@ import (
 func ReadProcessLogs(address string, port int, name string, offset int, follow bool) error {
 	interrupt := make(chan os.Signal, 1)
 	signal.Notify(interrupt, os.Interrupt)
-	url := fmt.Sprintf("ws://%s:%d/process/logs/ws/%s/%d/%v", address, port, name, offset, follow)
+	url := fmt.Sprintf("ws://%s:%d/process/logs/ws?name=%s&offset=%d&follow=%v", address, port, name, offset, follow)
 	log.Info().Msgf("Connecting to %s", url)
 	ws, _, err := websocket.DefaultDialer.Dial(url, nil)
 	if err != nil {