Merge pull request #3 from timehop/better-default-flags

Use the same default flags as stdlib’s log I just think this is what most Go developers will expect; I know I did.
timehop · Apr 15, 2015 · f7b5bd9 · f7b5bd9
2 parents 267e234 + 7cc7fa2
commit f7b5bd9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/log/logging.go b/log/logging.go
@@ -57,7 +57,7 @@ const (
 	FlagsPrecisionTime = log.Lmicroseconds
 	FlagsLongFile      = log.Llongfile
 	FlagsShortFile     = log.Lshortfile
-	FlagsDefault       = FlagsNone
+	FlagsDefault       = log.LstdFlags
 )
 
 var (
@@ -88,7 +88,11 @@ func init() {
 		Level = LevelTrace
 	}
 
-	Flags, _ = strconv.Atoi(os.Getenv("LOG_FORMAT"))
+	var err error
+	Flags, err = strconv.Atoi(os.Getenv("LOG_FORMAT"))
+	if err != nil {
+		Flags = FlagsDefault
+	}
 
 	DefaultLogger = New()
 }

diff --git a/log/logging_test.go b/log/logging_test.go
@@ -16,6 +16,7 @@ var _ = Describe("Logging functions", func() {
 	BeforeEach(func() {
 		output = new(bytes.Buffer)
 		log.Level = log.LevelTrace
+		log.SetTimestampFlags(log.FlagsNone)
 		log.SetOutput(output)
 	})