about summary refs log tree commit diff
path: root/tools/nixery/server/main.go
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2019-10-28T17·32+0100
committerVincent Ambo <github@tazj.in>2019-10-28T21·31+0100
commitd8fba233655e127d54926394eacd4b9391ec8b8b (patch)
treec005b0c965864de6b30ef683c9057d01494d2192 /tools/nixery/server/main.go
parent30e618b65bdd330ea5904b2be00cbac46d5b03e3 (diff)
fix(server): Thread request context to all relevant places
Previously background contexts where created where necessary (e.g. in
GCS interactions). Should I begin to use request timeouts or other
context-dependent things in the future, it's useful to have the actual
HTTP request context around.

This threads the request context through the application to all places
that need it.
Diffstat (limited to 'tools/nixery/server/main.go')
-rw-r--r--tools/nixery/server/main.go6
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/nixery/server/main.go b/tools/nixery/server/main.go
index f4f707313f22..6ae0730906dc 100644
--- a/tools/nixery/server/main.go
+++ b/tools/nixery/server/main.go
@@ -26,7 +26,6 @@
 package main
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -110,7 +109,6 @@ func writeError(w http.ResponseWriter, status int, code, message string) {
 }
 
 type registryHandler struct {
-	ctx   context.Context
 	state *builder.State
 }
 
@@ -132,7 +130,7 @@ func (h *registryHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}).Info("requesting image manifest")
 
 		image := builder.ImageFromName(imageName, imageTag)
-		buildResult, err := builder.BuildImage(h.ctx, h.state, &image)
+		buildResult, err := builder.BuildImage(r.Context(), h.state, &image)
 
 		if err != nil {
 			writeError(w, 500, "UNKNOWN", "image build failure")
@@ -211,7 +209,6 @@ func main() {
 
 	log.WithField("backend", s.Name()).Info("initialised storage backend")
 
-	ctx := context.Background()
 	cache, err := builder.NewCache()
 	if err != nil {
 		log.WithError(err).Fatal("failed to instantiate build cache")
@@ -240,7 +237,6 @@ func main() {
 
 	// All /v2/ requests belong to the registry handler.
 	http.Handle("/v2/", &registryHandler{
-		ctx:   ctx,
 		state: &state,
 	})