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

Merge pull request #686 from openziti/multiple_warning_emails

Browse Source 
Fix for Multiple Warning Emails (#685)
This commit is contained in:
Michael Quigley 2024-06-27 13:15:43 -04:00 committed by GitHub
commit 9bb321285e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -6,6 +6,8 @@ FEATURE: Linux service support for all private share modes (contribution from St
FIX: Fix for mixing limited and unlimited (-1) resource counts in the limits system (https://github.com/openziti/zrok/issues/680) FIX: Fix for mixing limited and unlimited (-1) resource counts in the limits system (https://github.com/openziti/zrok/issues/680)
FIX: Fix for sending multiple warning emails when a warning is applied to an account (https://github.com/openziti/zrok/issues/685)
CHANGE: add Docker compose example for multiple share containers using the same enabled environment in [compose.override.yml](./docker/compose/zrok-public-reserved/compose.override.yml) CHANGE: add Docker compose example for multiple share containers using the same enabled environment in [compose.override.yml](./docker/compose/zrok-public-reserved/compose.override.yml)
CHANGE: bump many GitHub Actions that were using deprecated distributions of Node.js CHANGE: bump many GitHub Actions that were using deprecated distributions of Node.js

4
controller/limits/agent.go
View File

@ -443,7 +443,7 @@ func (a *Agent) isBandwidthClassLimitedForAccount(acctId int, bwc store.Bandwidt
if err != nil { if err != nil {
return nil, err return nil, err
} }
if je.Action == store.LimitLimitAction { if je.Action == bwc.GetLimitAction() {
logrus.Debugf("account '#%d' over bandwidth for global bandwidth class '%v'", acctId, bwc) logrus.Debugf("account '#%d' over bandwidth for global bandwidth class '%v'", acctId, bwc)
return je, nil return je, nil
} }
@ -456,7 +456,7 @@ func (a *Agent) isBandwidthClassLimitedForAccount(acctId int, bwc store.Bandwidt
if err != nil { if err != nil {
return nil, err return nil, err
} }
if je.Action == store.LimitLimitAction { if je.Action == bwc.GetLimitAction() {
logrus.Debugf("account '#%d' over bandwidth for limit class '%v'", acctId, bwc) logrus.Debugf("account '#%d' over bandwidth for limit class '%v'", acctId, bwc)
return je, nil return je, nil
} }