make state method consistent (#135)

quay · Mar 5, 2020 · 22cafb9 · 22cafb9
1 parent ad81962
commit 22cafb9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/libindex/handler.go b/libindex/handler.go
@@ -30,8 +30,15 @@ func NewHandler(l *Libindex) *HTTP {
 }
 
 func (h *HTTP) State(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	log := zerolog.Ctx(ctx).With().
+		Str("method", "index").
+		Logger()
+	ctx = log.WithContext(ctx)
+
 	w.Header().Set("content-type", "text/plain")
-	fmt.Fprintln(w, h.l.State())
+	s, _ := h.l.State(ctx)
+	fmt.Fprintln(w, s)
 }
 
 func (h *HTTP) Index(w http.ResponseWriter, r *http.Request) {

diff --git a/libindex/libindex.go b/libindex/libindex.go
@@ -119,8 +119,8 @@ func (l *Libindex) Index(ctx context.Context, manifest *claircore.Manifest) (*cl
 //
 // If the identifier has changed, clients should arrange for layers to be
 // re-indexed.
-func (l *Libindex) State() string {
-	return l.state
+func (l *Libindex) State(ctx context.Context) (string, error) {
+	return l.state, nil
 }
 
 func (l *Libindex) index(ctx context.Context, s *controller.Controller, m *claircore.Manifest) *claircore.IndexReport {