Merge pull request #686 from openziti/multiple_warning_emails

Fix for Multiple Warning Emails (#685)

CHANGELOG.md

@@ -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 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: bump many GitHub Actions that were using deprecated distributions of Node.js

controller/limits/agent.go

@@ -443,7 +443,7 @@ func (a *Agent) isBandwidthClassLimitedForAccount(acctId int, bwc store.Bandwidt
 			if err != nil {
 				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)
 				return je, nil
 			}
@@ -456,7 +456,7 @@ func (a *Agent) isBandwidthClassLimitedForAccount(acctId int, bwc store.Bandwidt
 			if err != nil {
 				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)
 				return je, nil
 			}