.

Author: kdudkov

CHANGELOG.md

@@ -3,6 +3,11 @@
 FEATURES:
 
 - multiple file processing with `takreplay`. Like `./takreplay -format stats data/log/*.tak`
+- cot drops metric added
+
+FIXES:
+
+- xml cot handler fixed
 
 # 0.17.0
 

cmd/goatak_server/main.go

@@ -105,7 +105,7 @@ func NewApp(config *AppConfig) *App {
 		config:          config,
 		packageManager:  pm.NewPackageManager(filepath.Join(config.dataDir, "mp")),
 		users:           repository.NewFileUserRepo(config.usersFile),
-		ch:              make(chan *cot.CotMessage, 20),
+		ch:              make(chan *cot.CotMessage, 100),
 		handlers:        sync.Map{},
 		changeCb:        callbacks.New[*model.Item](),
 		deleteCb:        callbacks.New[string](),
@@ -202,7 +202,12 @@ func (app *App) NewCotMessage(msg *cot.CotMessage) {
 		}
 
 		messagesMetric.With(prometheus.Labels{"scope": msg.Scope, "msg_type": t}).Inc()
-		app.ch <- msg
+
+		select {
+		case app.ch <- msg:
+		default:
+			dropMetric.With(prometheus.Labels{"scope": msg.Scope, "reason": "main_ch"}).Inc()
+		}
 	}
 }
 

cmd/goatak_server/marti_api.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/kdudkov/goatak/cmd/goatak_server/mp"
 	"github.com/kdudkov/goatak/internal/pm"
+	"github.com/kdudkov/goatak/pkg/cot"
 
 	"github.com/kdudkov/goatak/pkg/cotproto"
 	"github.com/kdudkov/goatak/pkg/model"
@@ -592,12 +593,18 @@ func getVideoPostHandler(app *App) air.Handler {
 
 func getXmlHandler(app *App) air.Handler {
 	return func(req *air.Request, res *air.Response) error {
-		var evt *cotproto.CotEvent
+		uid := getStringParam(req, "uid")
 
-		if item := app.items.Get(getStringParam(req, "uid")); item != nil {
+		if uid == "" {
+			res.Status = http.StatusBadRequest
+			return res.WriteString("error")
+		}
+
+		var evt *cotproto.CotEvent
+		if item := app.items.Get(uid); item != nil {
 			evt = item.GetMsg().GetTakMessage().GetCotEvent()
 		} else {
-			di := app.missions.GetPoint(getStringParam(req, "uid"))
+			di := app.missions.GetPoint(uid)
 			if di != nil {
 				evt = di.GetEvent()
 			}
@@ -609,7 +616,7 @@ func getXmlHandler(app *App) air.Handler {
 			return nil
 		}
 
-		return res.WriteXML(evt)
+		return res.WriteXML(cot.CotToEvent(evt))
 	}
 }
 

cmd/goatak_server/metrics.go

@@ -13,6 +13,12 @@ var (
 		Help:      "The total number of cots processed",
 	}, []string{"scope", "msg_type"})
 
+	dropMetric = promauto.NewCounterVec(prometheus.CounterOpts{
+		Namespace: "goatak",
+		Name:      "cots_dropped",
+		Help:      "The total size of cots processed",
+	}, []string{"scope", "reason"})
+
 	connectionsMetric = promauto.NewGaugeVec(prometheus.GaugeOpts{
 		Namespace: "goatak",
 		Name:      "connections",

cmd/mm/main.go

@@ -81,9 +81,10 @@ func (app *App) Run(cmd string, args []string) {
 	switch cmd {
 	case "files", "mp":
 		app.listFiles()
-	case "get":
+	case "file", "get":
 		if len(args) != 2 {
 			fmt.Println("need hash and name")
+			return
 		}
 		app.getFile(args[0], args[1])
 	default: