httplog is not a CloseNotifier

We wrap TimeoutHandler with RecoverPanics, but httplog does not implement http.CloseNotifier, which causes a naive watch from curl against the insecure port to fail. For now, implement CloseNotifier (but we should consider removing httplog now that we have other tools in the stack to manage it).

httplog is not a CloseNotifier
0702164f · Clayton Coleman · 7a8b9e64 · 0702164f · 0702164f
Commit 0702164f authored Dec 20, 2015 by Clayton Coleman
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 0 deletions

log.go pkg/httplog/log.go +5 -0

master_test.go test/integration/master_test.go +14 -0

No files found.
--- a/pkg/httplog/log.go
+++ b/pkg/httplog/log.go
@@ -200,6 +200,11 @@ func (rl *respLogger) Hijack() (net.Conn, *bufio.ReadWriter, error) {
 	return rl.w.(http.Hijacker).Hijack()
 }
+// CloseNotify implements http.CloseNotifier
+func (rl *respLogger) CloseNotify() <-chan bool {
+	return rl.w.(http.CloseNotifier).CloseNotify()
+}
 func (rl *respLogger) recordStatus(status int) {
 	rl.status = status
 	rl.statusRecorded = true

--- a/test/integration/master_test.go
+++ b/test/integration/master_test.go
@@ -37,3 +37,17 @@ func TestExperimentalPrefix(t *testing.T) {
 		t.Fatalf("got status %v instead of 200 OK", resp.StatusCode)
 	}
 }
+func TestWatchSucceedsWithoutArgs(t *testing.T) {
+	_, s := framework.RunAMaster(t)
+	defer s.Close()
+	resp, err := http.Get(s.URL + "/api/v1/namespaces?watch=1")
+	if err != nil {
+		t.Fatalf("unexpected error getting experimental prefix: %v", err)
+	}
+	if resp.StatusCode != http.StatusOK {
+		t.Fatalf("got status %v instead of 200 OK", resp.StatusCode)
+	}
+	resp.Body.Close()
+}