Make closenotify work

rht · rht · commit 103fac67cf16 · 2015-11-23T09:33:17.000+07:00
License: MIT
Signed-off-by: rht &lt;rhtbot@gmail.com&gt;
diff --git a/commands/http/handler.go b/commands/http/handler.go
@@ -149,15 +149,6 @@ func (i internalHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	ctx, cancel := context.WithCancel(node.Context())
 	defer cancel()
-	if cn, ok := w.(http.CloseNotifier); ok {
-		go func() {
-			select {
-			case <-cn.CloseNotify():
-			case <-ctx.Done():
-			}
-			cancel()
-		}()
-	}
 
 	err = req.SetRootContext(ctx)
 	if err != nil {
@@ -166,17 +157,28 @@ func (i internalHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// call the command
-	res := i.root.Call(req)
+	go func() {
+		res := i.root.Call(req)
+		// now handle responding to the client properly
+		sendResponse(w, r, res, req)
+	}()
 
 	// set user's headers first.
 	for k, v := range i.cfg.Headers {
 		if !skipAPIHeader(k) {
 			w.Header()[k] = v
 		}
 	}
+	if cn, ok := w.(http.CloseNotifier); ok {
+		select {
+		case <-cn.CloseNotify():
+			log.Error("closenotify")
+		case <-ctx.Done():
+			log.Error("done")
+		}
+		cancel()
+	}
 
-	// now handle responding to the client properly
-	sendResponse(w, r, res, req)
 }
 
 func guessMimeType(res cmds.Response) (string, error) {
