about summary refs log tree commit diff
path: root/tools/nixery/server/builder
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2019-10-27T17·33+0100
committerVincent Ambo <github@tazj.in>2019-10-28T21·31+0100
commite8fd6b67348610ff7bbd4585036567b9e56945b7 (patch)
treed90066bd2a8d35efbc655227432e0772faf3a616 /tools/nixery/server/builder
parent20e0ca53cba796a67311360d7a21c0f7c8baf78a (diff)
refactor(server): Change setup to create new storage backends
Diffstat (limited to 'tools/nixery/server/builder')
-rw-r--r--tools/nixery/server/builder/builder.go4
-rw-r--r--tools/nixery/server/builder/cache.go2
2 files changed, 1 insertions, 5 deletions
diff --git a/tools/nixery/server/builder/builder.go b/tools/nixery/server/builder/builder.go
index e2982b993dac..17ea1b8e6209 100644
--- a/tools/nixery/server/builder/builder.go
+++ b/tools/nixery/server/builder/builder.go
@@ -27,7 +27,6 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"net/http"
 	"os"
 	"os/exec"
 	"sort"
@@ -45,9 +44,6 @@ import (
 // use up is set at a lower point.
 const LayerBudget int = 94
 
-// HTTP client to use for direct calls to APIs that are not part of the SDK
-var client = &http.Client{}
-
 // State holds the runtime state that is carried around in Nixery and
 // passed to builder functions.
 type State struct {
diff --git a/tools/nixery/server/builder/cache.go b/tools/nixery/server/builder/cache.go
index 2af214cd9188..4aed4b53463f 100644
--- a/tools/nixery/server/builder/cache.go
+++ b/tools/nixery/server/builder/cache.go
@@ -125,7 +125,7 @@ func manifestFromCache(ctx context.Context, s *State, key string) (json.RawMessa
 		log.WithError(err).WithFields(log.Fields{
 			"manifest": key,
 			"backend":  s.Storage.Name(),
-		})
+		}).Error("failed to fetch manifest from cache")
 
 		return nil, false
 	}