tvolkmann/gyrogpsc
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases 1 Wiki Activity

fixed wrong param type in http handler

Browse Source
This commit is contained in:
Timo Volkmann 2020-12-13 03:38:00 +01:00
parent f223bbec8f
commit 145642c6e9
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/http.go
View File

@ -1,6 +1,7 @@
package web package web
import ( import (
"errors"
"git.timovolkmann.de/gyrogpsc/core" "git.timovolkmann.de/gyrogpsc/core"
"github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2"
"github.com/gofiber/template/html" "github.com/gofiber/template/html"
@ -71,13 +72,14 @@ func allTrackingsHandler(s core.Service, c *core.Configuration) fiber.Handler {
func startPipelineHandler(s core.Service, c *core.Configuration) fiber.Handler { func startPipelineHandler(s core.Service, c *core.Configuration) fiber.Handler {
return func(ctx *fiber.Ctx) error { return func(ctx *fiber.Ctx) error {
var collecs []core.CollectorType var collecs []core.CollectorType
ser := ctx.Params("serial", "true") ser := ctx.Query("serial", "true")
if ser == "true" { if ser == "true" {
collecs = append(collecs, core.SERIAL) collecs = append(collecs, core.SERIAL)
} else if ser != "false" && ser != "" { } else if ser != "false" && ser != "" {
collecs = append(collecs, core.CollectorType(ser)) // TODO: allow passing serial port as url parameter collecs = append(collecs, core.CollectorType(ser)) // TODO: allow passing serial port as url parameter
} }
tcp := ctx.Params("tcp", "true") tcp := ctx.Query("tcp", "true")
logrus.Debugln("query values: serial/tcp", ser, tcp)
if tcp == "true" { if tcp == "true" {
collecs = append(collecs, core.TCP) collecs = append(collecs, core.TCP)
} }
@ -88,10 +90,13 @@ func startPipelineHandler(s core.Service, c *core.Configuration) fiber.Handler {
} }
prepres := map[string]interface{}{} prepres := map[string]interface{}{}
prepres["tracking_state"] = res prepres["tracking_state"] = res
//prepres["data"] = res prepres["data"] = collecs
if err != nil { if err != nil {
prepres["error"] = err.Error() prepres["error"] = err.Error()
}
if len(collecs) == 0 {
e := errors.New("attention! no collectors running. start a new pipeline")
prepres["error"] = e.Error()
} }
err2 := ctx.JSON(prepres) err2 := ctx.JSON(prepres)
if err2 != nil { if err2 != nil {