cancel contexts when client disconnects

whyrusleeping · whyrusleeping · commit 228766efb9c1 · 2015-07-29T11:00:52.000-07:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/commands/http/handler.go b/commands/http/handler.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/rs/cors"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 
 	cmds "github.com/ipfs/go-ipfs/commands"
 	u "github.com/ipfs/go-ipfs/util"
@@ -119,7 +120,11 @@ func (i internalHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	//ps: take note of the name clash - commands.Context != context.Context
 	req.SetInvocContext(i.ctx)
-	err = req.SetRootContext(node.Context())
+
+	ctx, cancel := context.WithCancel(node.Context())
+	defer cancel()
+
+	err = req.SetRootContext(ctx)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
@@ -204,7 +209,12 @@ func sendResponse(w http.ResponseWriter, req cmds.Request, res cmds.Response) {
 	h.Set(transferEncodingHeader, "chunked")
 
 	if err := writeResponse(status, w, out); err != nil {
-		log.Error("error while writing stream", err)
+		if strings.Contains(err.Error(), "broken pipe") {
+			log.Info("client disconnect while writing stream ", err)
+			return
+		}
+
+		log.Error("error while writing stream ", err)
 	}
 }
 
