extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-26 04:31:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

better handling of non-zrok usage data

Browse Source
This commit is contained in:
Michael Quigley 2023-06-16 13:28:00 -04:00
parent 36d267256f
commit 23c275f930
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/limits/agent.go
View File

@ -220,7 +220,7 @@ mainLoop:
lastCycle = time.Now() lastCycle = time.Now()
} }
} else { } else {
logrus.Warn("not enforcing for usage with no share token: %v", usage.String()) logrus.Warnf("not enforcing for usage with no share token: %v", usage.String())
} }
case <-time.After(a.cfg.Cycle): case <-time.After(a.cfg.Cycle):

7
controller/metrics/agent.go
View File

@ -45,9 +45,13 @@ func (a *Agent) Start() error {
select { select {
case event := <-a.events: case event := <-a.events:
if usage, err := Ingest(event.Data()); err == nil { if usage, err := Ingest(event.Data()); err == nil {
if usage.AccountId != 0 || usage.EnvironmentId != 0 {
if err := a.cache.addZrokDetail(usage); err != nil { if err := a.cache.addZrokDetail(usage); err != nil {
logrus.Errorf("unable to add zrok detail for: %v: %v", usage.String(), err) logrus.Errorf("unable to add zrok detail for: %v: %v", usage.String(), err)
} }
} else {
logrus.Debugf("skipping zrok detail for: %v", usage.String())
}
shouldAck := true shouldAck := true
for _, snk := range a.snks { for _, snk := range a.snks {
if err := snk.Handle(usage); err != nil { if err := snk.Handle(usage); err != nil {
@ -64,9 +68,6 @@ func (a *Agent) Start() error {
} }
} else { } else {
logrus.Errorf("unable to ingest '%v': %v", event.Data(), err) logrus.Errorf("unable to ingest '%v': %v", event.Data(), err)
if err := event.Ack(); err != nil {
logrus.Errorf("unable to ack unparseable message: %v", err)
}
} }
} }
} }