still WIP

whyrusleeping · whyrusleeping · commit 590e1c86b4ae · 2015-11-22T16:31:05.000-08:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/commands/http/client.go b/commands/http/client.go
@@ -30,7 +30,7 @@ type Client interface {
 
 type client struct {
 	serverAddress string
-	httpClient    http.Client
+	httpClient    *http.Client
 }
 
 func NewClient(address string) Client {
@@ -39,9 +39,14 @@ func NewClient(address string) Client {
 	// refused on 'client.Do'
 	return &client{
 		serverAddress: address,
-		httpClient: http.Client{
-			Transport: &http.Transport{},
-		},
+		httpClient:    http.DefaultClient,
+		/*
+			httpClient: &http.Client{
+				Transport: &http.Transport{
+					DisableKeepAlives: true,
+				},
+			},
+		*/
 	}
 }
 
@@ -98,7 +103,9 @@ func (c *client) Send(req cmds.Request) (cmds.Response, error) {
 
 	// set request canceller
 	httpReq.Cancel = req.Context().Done()
+	httpReq.Close = true
 
+	log.Error("about to do")
 	httpRes, err := c.httpClient.Do(httpReq)
 	if err != nil {
 		return nil, err
diff --git a/commands/http/handler.go b/commands/http/handler.go
@@ -108,6 +108,29 @@ func (i Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 func (i internalHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	log.Debug("Incoming API request: ", r.URL)
 
+	// get the node's context to pass into the commands.
+	node, err := i.ctx.GetNode()
+	if err != nil {
+		s := fmt.Sprintf("cmds/http: couldn't GetNode(): %s", err)
+		http.Error(w, s, http.StatusInternalServerError)
+		return
+	}
+
+	ctx, cancel := context.WithCancel(node.Context())
+	defer cancel()
+	if cn, ok := w.(http.CloseNotifier); ok {
+		go func() {
+			log.Error("start close notif")
+			select {
+			case <-cn.CloseNotify():
+				log.Error("CLOSE NOTIFY")
+			case <-ctx.Done():
+			}
+			log.Error("done close notif")
+			cancel()
+		}()
+	}
+
 	defer func() {
 		if r := recover(); r != nil {
 			log.Error(r)
@@ -136,30 +159,9 @@ func (i internalHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// get the node's context to pass into the commands.
-	node, err := i.ctx.GetNode()
-	if err != nil {
-		s := fmt.Sprintf("cmds/http: couldn't GetNode(): %s", err)
-		http.Error(w, s, http.StatusInternalServerError)
-		return
-	}
-
 	//ps: take note of the name clash - commands.Context != context.Context
 	req.SetInvocContext(i.ctx)
 
-	ctx, cancel := context.WithCancel(node.Context())
-	defer cancel()
-	if cn, ok := w.(http.CloseNotifier); ok {
-		go func() {
-			select {
-			case <-cn.CloseNotify():
-				log.Error("CLOSE NOTIFY")
-			case <-ctx.Done():
-			}
-			cancel()
-		}()
-	}
-
 	err = req.SetRootContext(ctx)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
