add stderr

Author: iwind

client.go

@@ -58,7 +58,7 @@ func (this *Client) KeepAlive() {
 	this.keepAlive = true
 }
 
-func (this *Client) Call(req *Request) (*http.Response, error) {
+func (this *Client) Call(req *Request) (resp *http.Response, stderr []byte, err error) {
 	this.isFree = false
 
 	this.locker.Lock()
@@ -67,7 +67,7 @@ func (this *Client) Call(req *Request) (*http.Response, error) {
 		err := this.Connect()
 		if err != nil {
 			this.locker.Unlock()
-			return nil, err
+			return nil, nil, err
 		}
 	}
 
@@ -84,13 +84,13 @@ func (this *Client) Call(req *Request) (*http.Response, error) {
 	}()
 
 	if this.conn == nil {
-		return nil, errors.New("no connection to server")
+		return nil, nil, errors.New("no connection to server")
 	}
 
 	if req.timeout > 0 {
 		this.beforeTime(req.timeout)
 	}
-	resp, err := req.CallOn(this.conn)
+	resp, stderr, err = req.CallOn(this.conn)
 	this.endTime()
 
 	// 如果失去连接，则重新连接
@@ -105,7 +105,7 @@ func (this *Client) Call(req *Request) (*http.Response, error) {
 				if req.timeout > 0 {
 					this.beforeTime(req.timeout)
 				}
-				resp, err = req.CallOn(this.conn)
+				resp, stderr, err = req.CallOn(this.conn)
 				this.endTime()
 			} else {
 				log.Println("[gofcgi]again:" + err.Error())
@@ -114,7 +114,7 @@ func (this *Client) Call(req *Request) (*http.Response, error) {
 		}
 	}
 
-	return resp, err
+	return resp, stderr, err
 }
 
 func (this *Client) Close() {

client_test.go

@@ -38,11 +38,15 @@ func TestClientGet(t *testing.T) {
 		"REQUEST_METHOD": "GET",
 	})
 
-	resp, err := client.Call(req)
+	resp, stderr, err := client.Call(req)
 	if err != nil {
 		t.Fatal("do error:", err.Error())
 	}
 
+	if len(stderr) > 0 {
+		t.Fatal("stderr:", string(stderr))
+	}
+
 	t.Log("resp, status:", resp.StatusCode)
 	t.Log("resp, status message:", resp.Status)
 	t.Log("resp headers:", resp.Header)
@@ -85,7 +89,7 @@ func TestClientGetAlive(t *testing.T) {
 			"REQUEST_METHOD": "GET",
 		})
 
-		resp, err := client.Call(req)
+		resp, _, err := client.Call(req)
 		if err != nil {
 			t.Fatal("do error:", err.Error())
 		}
@@ -138,7 +142,7 @@ func TestClientPost(t *testing.T) {
 	//req.SetParam("CONTENT_LENGTH", fmt.Sprintf("%d", r.Len()))
 	req.SetBody(r, uint32(r.Len()))
 
-	resp, err := client.Call(req)
+	resp, _, err := client.Call(req)
 	if err != nil {
 		t.Fatal("do error:", err.Error())
 	}
@@ -196,7 +200,7 @@ func TestClientPerformance(t *testing.T) {
 					"REQUEST_METHOD": "GET",
 				})
 
-				resp, err := client.Call(req)
+				resp, _, err := client.Call(req)
 				if err != nil {
 					locker.Lock()
 					countFail++

request.go

@@ -63,20 +63,20 @@ func (this *Request) SetTimeout(timeout time.Duration) {
 	this.timeout = timeout
 }
 
-func (this *Request) CallOn(conn net.Conn) (*http.Response, error) {
-	err := this.writeBeginRequest(conn)
+func (this *Request) CallOn(conn net.Conn) (resp *http.Response, stderr []byte, err error) {
+	err = this.writeBeginRequest(conn)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	err = this.writeParams(conn)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	err = this.writeStdin(conn)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	return this.readStdout(conn)
@@ -187,15 +187,14 @@ func (this *Request) writeRecord(conn net.Conn, recordType byte, contentData []b
 	return nil
 }
 
-func (this *Request) readStdout(conn net.Conn) (*http.Response, error) {
+func (this *Request) readStdout(conn net.Conn) (resp *http.Response, stderr []byte, err error) {
 	stdout := []byte{}
-	stderr := []byte{}
 
 	for {
 		respHeader := Header{}
 		err := binary.Read(conn, binary.BigEndian, &respHeader)
 		if err != nil {
-			return nil, ErrClientDisconnect
+			return nil, nil, ErrClientDisconnect
 		}
 
 		// 检查ID是否一致
@@ -207,7 +206,7 @@ func (this *Request) readStdout(conn net.Conn) (*http.Response, error) {
 		err = binary.Read(conn, binary.BigEndian, &b)
 		if err != nil {
 			log.Println("err:", err.Error())
-			return nil, ErrClientDisconnect
+			return nil, nil, ErrClientDisconnect
 		}
 
 		if respHeader.Type == FCGI_STDOUT {
@@ -243,7 +242,7 @@ func (this *Request) readStdout(conn net.Conn) (*http.Response, error) {
 		resp, err := http.ReadResponse(bufio.NewReader(bytes.NewReader(statusStdout)), nil)
 
 		if err != nil {
-			return nil, err
+			return nil, stderr, err
 		}
 
 		if !foundStatus {
@@ -263,14 +262,14 @@ func (this *Request) readStdout(conn net.Conn) (*http.Response, error) {
 			}
 		}
 
-		return resp, nil
+		return resp, stderr, nil
 	}
 
 	if len(stderr) > 0 {
-		return nil, errors.New("fcgi:" + string(stderr))
+		return nil, stderr, errors.New("fcgi:" + string(stderr))
 	}
 
-	return nil, errors.New("no response from server")
+	return nil, stderr, errors.New("no response from server")
 }
 
 func (this *Request) nextId() uint16 {