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

Structured log: replace ngaut/log with logrus #612

Merged
merged 21 commits into from
Apr 24, 2017
Merged

Structured log: replace ngaut/log with logrus #612

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
18ba74f
vendor: prepare vendor for logrus
andelf Apr 11, 2017
b9be636
*: replace ngaut/log with logrus
andelf Apr 11, 2017
b99587a
server/util: fix typo
andelf Apr 11, 2017
de7eb72
server/util: address commit
andelf Apr 12, 2017
7e82d84
*: isolate logutil subpackage
andelf Apr 12, 2017
ddf4e8a
pkg/logutil: add testcase
andelf Apr 12, 2017
f398ee5
*: minor fix, robust error handling
andelf Apr 12, 2017
909b94c
Merge branch 'master' into structured-log-stage1-use-logrus
siddontang Apr 13, 2017
f82f062
pkg/logutil: add filename check test
andelf Apr 13, 2017
805fa46
conf: log config
andelf Apr 13, 2017
025e7c6
Merge branch 'structured-log-stage1-use-logrus' of github.com:andelf/…
andelf Apr 13, 2017
59c005e
*: fix log config backward compatibility
andelf Apr 14, 2017
a980205
*: address comment
andelf Apr 14, 2017
376c8f0
config: fix debug print
andelf Apr 14, 2017
2013cfa
pkg/logutil: remove trim square bracket
andelf Apr 18, 2017
7bb9555
pkg/logutil: add tests
andelf Apr 19, 2017
37a41ad
Merge branch 'master' into structured-log-stage1-use-logrus
ngaut Apr 22, 2017
acabc9b
pkg/logutil: isolate file log config
andelf Apr 24, 2017
6144c5c
ci: fix circle-ci under forked projects
andelf Apr 24, 2017
96fa7d6
Merge remote-tracking branch 'origin/master' into structured-log-stag…
andelf Apr 24, 2017
2f600b8
merge origin/master
andelf Apr 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/logutil/log_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@ func (s *testLogSuite) SetUpSuite(c *C) {
s.buf = &bytes.Buffer{}
}

func (s *testLogSuite) TestStringToLogLevel(c *C) {
c.Assert(stringToLogLevel("fatal"), Equals, log.FatalLevel)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can use table-driven test here.

let tt = []struct {
    name string
    level Level
} {
    {"ERROR", log.ErrorLevel},
    ...
}

for _, t := range tt {
   c.Assert()
}

c.Assert(stringToLogLevel("ERROR"), Equals, log.ErrorLevel)
c.Assert(stringToLogLevel("warn"), Equals, log.WarnLevel)
c.Assert(stringToLogLevel("warning"), Equals, log.WarnLevel)
c.Assert(stringToLogLevel("debug"), Equals, log.DebugLevel)
c.Assert(stringToLogLevel("info"), Equals, log.InfoLevel)
c.Assert(stringToLogLevel("whatever"), Equals, log.InfoLevel)
}

// TestLogging assure log format and log redirection works.
func (s *testLogSuite) TestLogging(c *C) {
conf := &LogConfig{Level: "warn", Filename: ""}
Expand Down