jxyowen 7 years ago
parent
commit
6897b6d24e
3 changed files with 62 additions and 6 deletions
  1. 2 0
      glide.yaml
  2. 52 0
      sdk/log/log.go
  3. 8 6
      sdk/responses/response.go

+ 2 - 0
glide.yaml

@@ -8,6 +8,8 @@ import:
   version: ^0.2.2
 - package: github.com/json-iterator/go
   version: ^1.0.4
+- package: github.com/sirupsen/logrus
+
 testImport:
 - package: github.com/stretchr/testify
   version: ^1.1.4

+ 52 - 0
sdk/log/log.go

@@ -0,0 +1,52 @@
+package log
+
+import (
+	"github.com/sirupsen/logrus"
+	"os"
+)
+
+func init() {
+	logrus.SetOutput(os.Stdout)
+	logrus.SetFormatter(&logrus.TextFormatter{
+		DisableColors: false,
+		FullTimestamp: true,
+	})
+
+}
+
+func WithFields(fields logrus.Fields) *logrus.Entry {
+	return logrus.WithFields(logrus.Fields(fields))
+}
+
+var (
+	PanicLevel = logrus.PanicLevel
+	FatalLevel = logrus.FatalLevel
+	ErrorLevel = logrus.ErrorLevel
+	WarnLevel = logrus.WarnLevel
+	InfoLevel = logrus.InfoLevel
+	DebugLevel = logrus.DebugLevel
+
+	SetLevel = logrus.SetLevel
+	GetLevel = logrus.GetLevel
+
+	WithError = logrus.WithError
+	WithField = logrus.WithField
+
+	Debug   = logrus.Debug
+	Print   = logrus.Print
+	Info    = logrus.Info
+	Warn    = logrus.Warn
+	Warning = logrus.Warning
+	Error   = logrus.Error
+	Panic   = logrus.Panic
+	Fatal   = logrus.Fatal
+
+	Debugf   = logrus.Debugf
+	Printf   = logrus.Printf
+	Infof    = logrus.Infof
+	Warnf    = logrus.Warnf
+	Warningf = logrus.Warningf
+	Errorf   = logrus.Errorf
+	Panicf   = logrus.Panicf
+	Fatalf   = logrus.Fatalf
+)

+ 8 - 6
sdk/responses/response.go

@@ -20,8 +20,8 @@ import (
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors"
 	"io/ioutil"
 	"net/http"
-	"strconv"
 	"strings"
+	"fmt"
 )
 
 type AcsResponse interface {
@@ -112,15 +112,17 @@ func (baseResponse *BaseResponse) parseFromHttpResponse(httpResponse *http.Respo
 func (baseResponse *BaseResponse) String() string {
 	resultBuilder := bytes.Buffer{}
 	// statusCode
-	resultBuilder.WriteString("StatusCode : " + strconv.Itoa(baseResponse.httpStatus) + "\n")
+	resultBuilder.WriteString("\n")
+	resultBuilder.WriteString(fmt.Sprintf("%s %s\n", baseResponse.originHttpResponse.Proto, baseResponse.originHttpResponse.Status))
 	// httpHeaders
-	resultBuilder.WriteString("Headers:\n")
+	//resultBuilder.WriteString("Headers:\n")
 	for key, value := range baseResponse.httpHeaders {
-		resultBuilder.WriteString(" -> " + key + " : " + strings.Join(value, ";") + "\n")
+		resultBuilder.WriteString(key + ": " + strings.Join(value, ";") + "\n")
 	}
+	resultBuilder.WriteString("\n")
 	// content
-	resultBuilder.WriteString("Content:\n")
-	resultBuilder.WriteString(" -> " + baseResponse.httpContentString + "\n")
+	//resultBuilder.WriteString("Content:\n")
+	resultBuilder.WriteString(baseResponse.httpContentString + "\n")
 	return resultBuilder.String()
 }