Start up OK even if api.fastly.com is unreachable (#89)

fastly · Jan 8, 2022 · 01211fb · 01211fb
1 parent 1e1277d
commit 01211fb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/cmd/fastly-exporter/main.go b/cmd/fastly-exporter/main.go
@@ -254,13 +254,20 @@ func main() {
 	}
 
 	{
-		g, ctx := errgroup.WithContext(context.Background())
-		g.Go(func() error { return serviceCache.Refresh(ctx) })
-		g.Go(func() error { return datacenterCache.Refresh(ctx) })
-		if err := g.Wait(); err != nil {
-			level.Error(apiLogger).Log("during", "initial API calls", "err", err)
-			os.Exit(1)
-		}
+		var g errgroup.Group
+		g.Go(func() error {
+			if err := serviceCache.Refresh(context.Background()); err != nil {
+				level.Warn(logger).Log("during", "initial fetch of service IDs", "err", err, "msg", "service metrics unavailable, will retry")
+			}
+			return nil
+		})
+		g.Go(func() error {
+			if err := datacenterCache.Refresh(context.Background()); err != nil {
+				level.Warn(logger).Log("during", "initial fetch of datacenters", "err", err, "msg", "datacenter labels unavailable, will retry")
+			}
+			return nil
+		})
+		g.Wait()
 	}
 
 	var defaultGatherers prometheus.Gatherers

diff --git a/pkg/api/common.go b/pkg/api/common.go
@@ -28,7 +28,7 @@ func NewError(resp *http.Response) *Error {
 // Error implements the error interface.
 func (e *Error) Error() string {
 	var sb strings.Builder
-	sb.WriteString("api.fastly.com responded with")
+	sb.WriteString("api.fastly.com responded with ")
 	sb.WriteString(http.StatusText(e.Code))
 	if e.Msg != "" {
 		sb.WriteString(" (" + e.Msg + ")")