diff --git a/cmd/goatak_server/main.go b/cmd/goatak_server/main.go index 532e261..7b875ea 100644 --- a/cmd/goatak_server/main.go +++ b/cmd/goatak_server/main.go @@ -341,6 +341,7 @@ func (app *App) route(msg *cot.CotMessage) bool { if dest := msg.GetDetail().GetDestCallsign(); len(dest) > 0 { for _, s := range dest { + app.logger.Info(fmt.Sprintf("point %s %s -> callsign %s", msg.GetUID(), msg.GetCallsign(), s)) app.sendToCallsign(s, msg) } diff --git a/cmd/goatak_server/mission_api.go b/cmd/goatak_server/mission_api.go index 6b70a36..31a7b28 100644 --- a/cmd/goatak_server/mission_api.go +++ b/cmd/goatak_server/mission_api.go @@ -37,6 +37,7 @@ func addMissionApi(app *App, f fiber.Router) { g.Get("/:missionname/cot", getMissionCotHandler(app)) g.Get("/:missionname/contacts", getMissionContactsHandler(app)) g.Put("/:missionname/contents", getMissionContentPutHandler(app)) + //g.Put("/:missionname/contents/missionpackage", getMissionContentPutHandler(app)) g.Delete("/:missionname/contents", getMissionContentDeleteHandler(app)) g.Get("/:missionname/log", getMissionLogHandler(app)) g.Put("/:missionname/keywords", getMissionKeywordsPutHandler(app)) diff --git a/pkg/log/fiber_logger.go b/pkg/log/fiber_logger.go index 551f0a2..4dcc8fc 100644 --- a/pkg/log/fiber_logger.go +++ b/pkg/log/fiber_logger.go @@ -27,12 +27,10 @@ func NewFiberLogger(conf *LoggerConfig) fiber.Handler { start := time.Now() chainErr := c.Next() wt := time.Since(start) + status := c.Response().StatusCode() - msg := fmt.Sprintf("%d %s %s %s", c.Response().StatusCode(), c.Method(), c.Path(), c.Request().URI().QueryArgs().String()) l := logger - status := c.Response().StatusCode() - if chainErr != nil { var e *fiber.Error if errors.As(chainErr, &e) { @@ -42,6 +40,8 @@ func NewFiberLogger(conf *LoggerConfig) fiber.Handler { l = l.With(slog.Any("error", chainErr)) } + msg := fmt.Sprintf("%d %s %s %s", status, c.Method(), c.Path(), c.Request().URI().QueryArgs().String()) + var attrs []any if conf.UserGetter != nil { attrs = []any{