Skip to content

Commit

Permalink
make consul rm
Browse files Browse the repository at this point in the history
  • Loading branch information
abericyang@gmail.com committed Sep 19, 2019
1 parent a68cd35 commit 212f150
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 66 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ gen### Go template
/example/
/profile.coverprofile
/overalls.coverprofile
/coverage.txt
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@ before_install:
- go get github.com/go-playground/overalls # overalls能够支持到各级子目录
- go get github.com/mattn/goveralls # 是coveralls对golang的测试覆盖率支持命令
- go get github.com/smartystreets/goconvey # 测试工具
- go get github.com/hashicorp/consul # consul测试

script:
- make checkTravis

go:
- 1.11.x
- 1.12.x
- master
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ veralls:
@echo "goveralls"
goveralls -coverprofile=overalls.coverprofile -service=travis-ci -repotoken $(COVERALLS_TOKEN)

traviscodecovtest:
@echo "travistest"
go test -race -coverprofile=coverage.txt -covermode=atomic

test:
@echo "test"
go test -v -cover $(PKGS_WITH_OUT_EXAMPLES)
8 changes: 2 additions & 6 deletions log.go
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,7 @@ func (l *LogCommon) logStandard(file, levelName, msg string, line int, ok bool,
if nil == l.files {
return
}
_ = pool().submitField(func(timeString, fileString, stackString, levelName, msg string, level Level, fields ...*Field) {
l.logFile(timeString, fileString, stackString, levelName, msg, level, fields...)
}, timeString, fileString, stackString, levelName, msg, level, fields...)
go l.logFile(timeString, fileString, stackString, levelName, msg, level, fields...)
}

// logFile 将日志内容输入文件中存储
Expand Down Expand Up @@ -428,9 +426,7 @@ func (l *LogCommon) useFiled(level Level, printString string) (fd *filed, err er
if err = l.checkFiled(level, fd, int64(len(printString)), false); nil != err {
return
}
err = pool().submit(func() {
fd.running()
})
go fd.running()
return
}
}
Expand Down
58 changes: 0 additions & 58 deletions pool.go

This file was deleted.

0 comments on commit 212f150

Please sign in to comment.