From 7bad019ac2c4c7715d59f3e292820fb39350a162 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Wed, 7 Jun 2017 10:08:02 +0200
Subject: [PATCH] order log levels ascending

Make the log level numbers more intuitive. Logging nothing is now log
level 0, debug logging is level 3.
---
 internal/utils/log.go      | 18 +++++++++---------
 internal/utils/log_test.go |  9 ++++++++-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/internal/utils/log.go b/internal/utils/log.go
index 85b8a5d5..997ae572 100644
--- a/internal/utils/log.go
+++ b/internal/utils/log.go
@@ -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...)
 	}
 }
diff --git a/internal/utils/log_test.go b/internal/utils/log_test.go
index 6df77a07..6a4a77f6 100644
--- a/internal/utils/log_test.go
+++ b/internal/utils/log_test.go
@@ -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))
 	})