Removed deprecated CloseNotifier

aerokube · Feb 18, 2019 · 52df8b9 · 52df8b9
1 parent 53b3234
commit 52df8b9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ggr-ui.go b/ggr-ui.go
@@ -53,7 +53,7 @@ func status(w http.ResponseWriter, r *http.Request) {
 	ch := make(chan struct{}, limit)
 	rslt := make(chan *result)
 	done := make(chan Status)
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithCancel(r.Context())
 	defer cancel()
 	go func(ctx context.Context) {
 		for sum, u := range hosts {
@@ -113,7 +113,7 @@ func status(w http.ResponseWriter, r *http.Request) {
 	case s := <-done:
 		w.Header().Add("Content-Type", "application/json")
 		json.NewEncoder(w).Encode(s)
-	case <-w.(http.CloseNotifier).CloseNotify():
+	case <-r.Context().Done():
 	}
 }
 

diff --git a/ggr-ui_test.go b/ggr-ui_test.go
@@ -214,7 +214,7 @@ func TestResponseTime(t *testing.T) {
 
 var (
 	silent = http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		<-w.(http.CloseNotifier).CloseNotify()
+		<-r.Context().Done()
 	}))
 	empty = http.Handler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprint(w, `{"total":1,"used":0,"queued":0,"pending":0,"browsers":{"chrome":{"60.0":{}},"firefox":{"59.0":{}}}}`)