Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

perfect the debug method #165

Merged
merged 1 commit into from
Jan 14, 2019
Merged

perfect the debug method #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion sdk/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"fmt"
"net/http"
"strconv"
"strings"
"sync"

"github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth"
Expand Down Expand Up @@ -219,7 +220,16 @@ func (client *Client) DoActionWithSigner(request requests.AcsRequest, response r
}
var httpResponse *http.Response
for retryTimes := 0; retryTimes <= client.config.MaxRetryTime; retryTimes++ {
debug("> %s %s %s", httpRequest.Method, httpRequest.URL.RequestURI(), httpRequest.Proto)
for key, value := range httpRequest.Header {
debug("> %s: %v", key, strings.Join(value, ""))
}
debug(">")
httpResponse, err = hookDo(client.httpClient.Do)(httpRequest)
debug("< %s %s", httpResponse.Proto, httpResponse.Status)
for key, value := range httpResponse.Header {
debug("< %s: %v", key, strings.Join(value, ""))
}
// receive error
if err != nil {
if !client.config.AutoRetry {
Expand Down Expand Up @@ -260,7 +270,6 @@ func buildHttpRequest(request requests.AcsRequest, singer auth.Signer, regionId
}
requestMethod := request.GetMethod()
requestUrl := request.BuildUrl()
debug("request URL: %s", requestUrl)
body := request.GetBodyReader()
httpRequest, err = http.NewRequest(requestMethod, requestUrl, body)
if err != nil {
Expand Down
7 changes: 7 additions & 0 deletions sdk/responses/response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"strings"

"github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors"
"github.com/aliyun/alibaba-cloud-sdk-go/sdk/utils"
)

type AcsResponse interface {
Expand All @@ -35,6 +36,11 @@ type AcsResponse interface {
parseFromHttpResponse(httpResponse *http.Response) error
}

var debug utils.Debug

func init() {
debug = utils.Init("sdk")
}
// Unmarshal object from http response body to target Response
func Unmarshal(response AcsResponse, httpResponse *http.Response, format string) (err error) {
err = response.parseFromHttpResponse(httpResponse)
Expand Down Expand Up @@ -109,6 +115,7 @@ func (baseResponse *BaseResponse) parseFromHttpResponse(httpResponse *http.Respo
if err != nil {
return
}
debug("< %s", string(body))
baseResponse.httpStatus = httpResponse.StatusCode
baseResponse.httpHeaders = httpResponse.Header
baseResponse.httpContentBytes = body
Expand Down