feat(pagerduty): Distinguish logging between throttled and non-throttled

For no other reason than to cut down on a bit of noise in the logs.
spinnaker · Sep 9, 2020 · 4958c00 · 4958c00
1 parent ce931c1
commit 4958c00
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/PagerDutyController.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/controllers/PagerDutyController.groovy
@@ -25,8 +25,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RequestMethod
 import org.springframework.web.bind.annotation.RestController
+import retrofit.RetrofitError
+
 import java.util.concurrent.atomic.AtomicReference
 
 @CompileStatic
@@ -79,15 +80,23 @@ class PagerDutyController {
       log.info("Fetched {} PagerDuty services", services?.size())
       pagerDutyServicesCache.set(services)
     } catch (e) {
-      log.error("Unable to refresh PagerDuty service list", e)
+      if (e instanceof RetrofitError && e.response?.status == 429) {
+        log.warn("Unable to refresh PagerDuty service list (throttled!)")
+      } else {
+        log.error("Unable to refresh PagerDuty service list", e)
+      }
     }
 
     try {
       List<Map> onCalls = fetchAllOnCalls()
       log.info("Fetched {} PagerDuty onCall", onCalls?.size())
       pagerDutyOnCallCache.set(onCalls)
     } catch (e) {
-      log.error("Unable to refresh PagerDuty onCall list", e)
+      if (e instanceof RetrofitError && e.response?.status == 429) {
+        log.warn("Unable to refresh PagerDuty onCall list (throttled!)")
+      } else {
+        log.error("Unable to refresh PagerDuty onCall list", e)
+      }
     }
   }