Merge pull request #269 from airbrake/bug-fix

refactor status and label select statement
airbrake · May 2, 2022 · 34b2d09 · 34b2d09
2 parents 8ee2a8f + 66c1247
commit 34b2d09
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/notifier.go b/notifier.go
@@ -23,7 +23,6 @@ const userAgent = notifierName + "/" + notifierVersion
 const waitTimeout = 5 * time.Second
 
 const httpEnhanceYourCalm = 420
-const httpStatusTooManyRequests = 429
 
 const maxNoticeLen = 64 * 1024
 
@@ -355,7 +354,7 @@ func (n *Notifier) sendNotice(notice *Notice) (string, error) {
 	switch resp.StatusCode {
 	case http.StatusUnauthorized:
 		return "", errUnauthorized
-	case httpStatusTooManyRequests:
+	case http.StatusTooManyRequests:
 		delayStr := resp.Header.Get("X-RateLimit-Delay")
 		delay, err := strconv.ParseInt(delayStr, 10, 64)
 		if err == nil {

diff --git a/queries.go b/queries.go
@@ -141,7 +141,7 @@ func (s *queryStats) send(m map[queryKey]*tdigestStat) error {
 	switch resp.StatusCode {
 	case http.StatusUnauthorized:
 		return errUnauthorized
-	case httpStatusTooManyRequests:
+	case http.StatusTooManyRequests:
 		return errIPRateLimited
 	}
 

diff --git a/queues.go b/queues.go
@@ -132,7 +132,7 @@ func (s *queueStats) send(m map[queueKey]*queueBreakdown) error {
 	switch resp.StatusCode {
 	case http.StatusUnauthorized:
 		return errUnauthorized
-	case httpStatusTooManyRequests:
+	case http.StatusTooManyRequests:
 		return errIPRateLimited
 	}
 

diff --git a/remote_config.go b/remote_config.go
@@ -75,6 +75,7 @@ func (rc *remoteConfig) Poll() {
 		rc.ticker = time.NewTicker(rc.Interval())
 
 		for {
+		sel:
 			select {
 			case <-rc.ticker.C:
 				if err := rc.tick(); err != nil {
@@ -87,7 +88,7 @@ func (rc *remoteConfig) Poll() {
 
 				rc.ticker = time.NewTicker(rc.Interval())
 			case <-rc.pollStop:
-				break
+				break sel
 			}
 		}
 	}()

diff --git a/routes.go b/routes.go
@@ -138,7 +138,7 @@ func (s *routeStats) send(m map[routeKey]*tdigestStat) error {
 	switch resp.StatusCode {
 	case http.StatusUnauthorized:
 		return errUnauthorized
-	case httpStatusTooManyRequests:
+	case http.StatusTooManyRequests:
 		return errIPRateLimited
 	}