Merge pull request #16 from tianxiaoliang/master

support depth

.travis.yml

@@ -25,10 +25,6 @@ jobs:
       script:
         - go get -u github.com/jgautheron/goconst/cmd/goconst
         - bash -x scripts/travis/goConstChecker.sh
-    - stage: GoLint Checker
-      script:
-        - go get -u github.com/golang/lint/golint
-        - bash -x scripts/travis/goLintChecker.sh
     - stage: GoCyclo Checker
       script:
         - go get github.com/fzipp/gocyclo

README.md

@@ -49,4 +49,4 @@ func main() {
 }
 
 ```
-See [Example](examples/main.go)
+See [Examples](examples)

examples/main.go → examples/native/main.go

@@ -19,13 +19,13 @@ func main() {
 	rotate.RunLogRotate("test.log", &rotate.RotateConfig{}, logger)
 	logger.Infof("Hi %s, system is starting up ...", "paas-bot")
 
-	logger.Debug("check-info", openlogging.Tags{
+	logger.Debug("check-info", openlogging.WithTags(openlogging.Tags{
 		"info": "something",
-	})
+	}))
 
-	logger.Warn("failed-to-do-somthing", openlogging.Tags{
+	logger.Warn("failed-to-do-somthing", openlogging.WithTags(openlogging.Tags{
 		"info": "something",
-	})
+	}))
 	logger.Warnf("failed-to-do-%s-somthing", "1")
 
 	logger.Error("failed-to-do-somthing")

examples/openlogging/main.go

@@ -0,0 +1,32 @@
+package main
+
+import (
+	"github.com/go-chassis/paas-lager"
+	"github.com/go-mesh/openlogging"
+)
+
+func main() {
+	log.Init(log.Config{
+		LoggerLevel:   "DEBUG",
+		LoggerFile:    "test.log",
+		EnableRsyslog: false,
+		LogFormatText: true,
+		Writers:       []string{"file", "stdout"},
+	})
+
+	logger := log.NewLogger("example")
+	openlogging.SetLogger(logger)
+
+	openlogging.Debug("check-info", openlogging.WithTags(openlogging.Tags{
+		"info": "something",
+	}))
+
+	openlogging.Warn("failed-to-do-somthing", openlogging.WithTags(openlogging.Tags{
+		"info": "something",
+	}))
+
+	openlogging.Error("failed-to-do-somthing")
+
+	openlogging.Info("shutting-down")
+
+}

lager_test.go

@@ -3,15 +3,14 @@ package log_test
 import (
 	"fmt"
 	"github.com/go-chassis/paas-lager"
-	"gopkg.in/yaml.v2"
 	"testing"
 )
 
 func BenchmarkInit(b *testing.B) {
 	log.Init(log.Config{
 		LoggerLevel:   "DEBUG",
 		LogFormatText: true,
-		Writers:       []string{"file", "stdout"},
+		Writers:       []string{"stdout"},
 	})
 
 	logger := log.NewLogger("example")
@@ -34,18 +33,3 @@ func (w *w) Write(p []byte) (n int, err error) {
 func TestRegisterWriter(t *testing.T) {
 	log.RegisterWriter("test", &w{})
 }
-
-func TestInit(t *testing.T) {
-	b := []byte(`
-writers: [file, stdout]
-
-`)
-	c := &log.Config{}
-	err := yaml.Unmarshal(b, c)
-	if err != nil {
-		t.Error(err)
-	}
-	if len(c.Writers) != 2 {
-		t.Error(c.Writers)
-	}
-}

third_party/forked/cloudfoundry/lager/logger.go

@@ -152,7 +152,7 @@ func (l *logger) logs(ss []Sink, loglevel LogLevel, action string, opts ...openl
 	}
 
 	// add file, lineno
-	addExtLogInfo(&log)
+	addExtLogInfo(&log, opt.Depth)
 	var logInfo string
 	for _, sink := range l.sinks {
 		if l.logFormatText {
@@ -256,10 +256,10 @@ func currentTimestamp() string {
 	return time.Now().Format("2006-01-02 15:04:05.000 -07:00")
 }
 
-func addExtLogInfo(logf *LogFormat) {
+func addExtLogInfo(logf *LogFormat, depth int) {
 
 	for i := 3; i <= 5; i++ {
-		_, file, line, ok := runtime.Caller(i)
+		_, file, line, ok := runtime.Caller(depth + i)
 
 		if strings.Index(file, "logger.go") > 0 {
 			continue