Merge remote-tracking branch 'oss/master' into database-refactor

This commit is contained in:
Brian Kassouf
2017-05-04 10:45:18 -07:00
88 changed files with 4430 additions and 1062 deletions

View File

@@ -84,6 +84,7 @@ func (c *ServerCommand) Run(args []string) int {
// start logging too early.
logGate := &gatedwriter.Writer{Writer: colorable.NewColorable(os.Stderr)}
var level int
logLevel = strings.ToLower(strings.TrimSpace(logLevel))
switch logLevel {
case "trace":
level = log.LevelTrace