order log levels ascending

Make the log level numbers more intuitive. Logging nothing is now log
level 0, debug logging is level 3.
This commit is contained in:
Marten Seemann
2017-06-07 10:08:02 +02:00
parent 9a55fe234f
commit 7bad019ac2
2 changed files with 17 additions and 10 deletions

View File

@@ -13,14 +13,14 @@ type LogLevel uint8
const (
logEnv = "QUIC_GO_LOG_LEVEL"
// LogLevelDebug enables debug logs (e.g. packet contents)
LogLevelDebug LogLevel = iota
// LogLevelInfo enables info logs (e.g. packets)
LogLevelInfo
// LogLevelError enables err logs
LogLevelError
// LogLevelNothing disables
LogLevelNothing
LogLevelNothing LogLevel = 0
// LogLevelError enables err logs
LogLevelError LogLevel = 1
// LogLevelInfo enables info logs (e.g. packets)
LogLevelInfo LogLevel = 2
// LogLevelDebug enables debug logs (e.g. packet contents)
LogLevelDebug LogLevel = 3
)
var (
@@ -49,14 +49,14 @@ func Debugf(format string, args ...interface{}) {
// Infof logs something
func Infof(format string, args ...interface{}) {
if logLevel <= LogLevelInfo {
if logLevel >= LogLevelInfo {
logMessage(format, args...)
}
}
// Errorf logs something
func Errorf(format string, args ...interface{}) {
if logLevel <= LogLevelError {
if logLevel >= LogLevelError {
logMessage(format, args...)
}
}

View File

@@ -29,6 +29,13 @@ var _ = Describe("Log", func() {
timeFormat = initialTimeFormat
})
It("the log level has the correct numeric value", func() {
Expect(LogLevelNothing).To(BeEquivalentTo(0))
Expect(LogLevelError).To(BeEquivalentTo(1))
Expect(LogLevelInfo).To(BeEquivalentTo(2))
Expect(LogLevelDebug).To(BeEquivalentTo(3))
})
It("log level nothing", func() {
SetLogLevel(LogLevelNothing)
Debugf("debug")
@@ -92,7 +99,7 @@ var _ = Describe("Log", func() {
It("reads log level from env", func() {
Expect(logLevel).To(Equal(LogLevelNothing))
os.Setenv(logEnv, "1")
os.Setenv(logEnv, "3")
readLoggingEnv()
Expect(logLevel).To(Equal(LogLevelDebug))
})