Merge pull request #10 from go-playground/sb10-master

Add SetExitFunc() + Additions

Author: Dean Karn

README.md

@@ -1,5 +1,5 @@
 ## log
-<img align="right" src="https://raw.githubusercontent.com/go-playground/log/master/logo.png">![Project status](https://img.shields.io/badge/version-4.2.0-green.svg)
+<img align="right" src="https://raw.githubusercontent.com/go-playground/log/master/logo.png">![Project status](https://img.shields.io/badge/version-4.3.0-green.svg)
 [![Build Status](https://semaphoreci.com/api/v1/joeybloggs/log/branches/master/badge.svg)](https://semaphoreci.com/joeybloggs/log)
 [![Coverage Status](https://coveralls.io/repos/github/go-playground/log/badge.svg?branch=master)](https://coveralls.io/github/go-playground/log?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/go-playground/log)](https://goreportcard.com/report/github.com/go-playground/log)
@@ -204,20 +204,17 @@ things for you the community.
 
 Benchmarks
 ----------
-###### Run on MacBook Pro (Retina, 15-inch, Late 2013) 2.6 GHz Intel Core i7 16 GB 1600 MHz DDR3 using Go version go1.6.2 darwin/amd64
+###### Run on i5-7600 16 GB DDR4-2400 using Go version go1.8 linux/amd64
 NOTE: only putting benchmarks at others request, by no means does the number of allocations 
 make one log library better than another!
 ```go
-go test -cpu=4 -bench=. -benchmem=true
-
-PASS
-BenchmarkLogConsoleTenFieldsParallel-4	 1000000	      1985 ns/op	    1113 B/op	      35 allocs/op
-BenchmarkLogConsoleSimpleParallel-4   	 3000000	       455 ns/op	      88 B/op	       4 allocs/op
-BenchmarkLogrusText10Fields-4         	  300000	      4179 ns/op	    4291 B/op	      63 allocs/op
-BenchmarkLogrusTextSimple-4           	 2000000	       655 ns/op	     672 B/op	      15 allocs/op
-BenchmarkLog1510Fields-4              	  100000	     16376 ns/op	    4378 B/op	      92 allocs/op
-BenchmarkLog15Simple-4                	 1000000	      1983 ns/op	     320 B/op	       9 allocs/op
-ok  	github.com/go-playground/log/benchmarks	10.716s
+go test --bench=. -benchmem=true
+BenchmarkLogConsoleTenFieldsParallel-4           1000000              1294 ns/op            1065 B/op         32 allocs/op
+BenchmarkLogConsoleSimpleParallel-4              3000000               549 ns/op             104 B/op          5 allocs/op
+BenchmarkLogrusText10Fields-4                     500000              2079 ns/op            2179 B/op         39 allocs/op
+BenchmarkLogrusTextSimple-4                      3000000               402 ns/op             312 B/op         14 allocs/op
+BenchmarkLog1510Fields-4                          200000             10915 ns/op            4362 B/op         91 allocs/op
+BenchmarkLog15Simple-4                           1000000              1292 ns/op             320 B/op          9 allocs/op
 ```
 
 Special Thanks

examples/basic/main.go renamed to _examples/basic/main.go

@@ -317,6 +317,10 @@ func defaultFormatFunc(c *Console) Formatter {
 					b = strconv.AppendUint(b, uint64(f.Value.(uint32)), base10)
 				case uint64:
 					b = strconv.AppendUint(b, f.Value.(uint64), base10)
+				case float32:
+					b = strconv.AppendFloat(b, float64(f.Value.(float32)), 'f', -1, 32)
+				case float64:
+					b = strconv.AppendFloat(b, f.Value.(float64), 'f', -1, 64)
 				case bool:
 					b = strconv.AppendBool(b, f.Value.(bool))
 				default:

examples/custom-handler/main.go renamed to _examples/custom-handler/main.go

@@ -820,10 +820,12 @@ func getConsoleLoggerColorTests() []test {
 				log.F("key", uint16(3)),
 				log.F("key", uint32(4)),
 				log.F("key", uint64(5)),
+				log.F("key", float32(5.33)),
+				log.F("key", float64(5.34)),
 				log.F("key", true),
 				log.F("key", struct{ value string }{"struct"}),
 			},
-			want: "UTC [32m DEBUG[0m debug [32mkey[0m=string [32mkey[0m=1 [32mkey[0m=2 [32mkey[0m=3 [32mkey[0m=4 [32mkey[0m=5 [32mkey[0m=1 [32mkey[0m=2 [32mkey[0m=3 [32mkey[0m=4 [32mkey[0m=5 [32mkey[0m=true [32mkey[0m={struct}\n",
+			want: "UTC [32m DEBUG[0m debug [32mkey[0m=string [32mkey[0m=1 [32mkey[0m=2 [32mkey[0m=3 [32mkey[0m=4 [32mkey[0m=5 [32mkey[0m=1 [32mkey[0m=2 [32mkey[0m=3 [32mkey[0m=4 [32mkey[0m=5 [32mkey[0m=5.33 [32mkey[0m=5.34 [32mkey[0m=true [32mkey[0m={struct}\n",
 		},
 	}
 }

handlers/console/console.go

@@ -276,6 +276,10 @@ func defaultFormatFunc(h HTTP) Formatter {
 				b = strconv.AppendUint(b, uint64(f.Value.(uint32)), base10)
 			case uint64:
 				b = strconv.AppendUint(b, f.Value.(uint64), base10)
+			case float32:
+				b = strconv.AppendFloat(b, float64(f.Value.(float32)), 'f', -1, 32)
+			case float64:
+				b = strconv.AppendFloat(b, f.Value.(float64), 'f', -1, 64)
 			case bool:
 				b = strconv.AppendBool(b, f.Value.(bool))
 			default:

handlers/console/console_test.go

@@ -235,10 +235,12 @@ func getTestHTTPLoggerTests() []test {
 				log.F("key", uint16(3)),
 				log.F("key", uint32(4)),
 				log.F("key", uint64(5)),
+				log.F("key", float32(5.33)),
+				log.F("key", float64(5.34)),
 				log.F("key", true),
 				log.F("key", struct{ value string }{"struct"}),
 			},
-			want: "UTC  DEBUG debug key=string key=1 key=2 key=3 key=4 key=5 key=1 key=2 key=3 key=4 key=5 key=true key={struct}",
+			want: "UTC  DEBUG debug key=string key=1 key=2 key=3 key=4 key=5 key=1 key=2 key=3 key=4 key=5 key=5.33 key=5.34 key=true key={struct}",
 		},
 		{
 			lvl:  log.TraceLevel,

handlers/http/http.go

@@ -310,6 +310,10 @@ func defaultFormatFunc(s *Syslog) Formatter {
 					b = strconv.AppendUint(b, uint64(f.Value.(uint32)), base10)
 				case uint64:
 					b = strconv.AppendUint(b, f.Value.(uint64), base10)
+				case float32:
+					b = strconv.AppendFloat(b, float64(f.Value.(float32)), 'f', -1, 32)
+				case float64:
+					b = strconv.AppendFloat(b, f.Value.(float64), 'f', -1, 64)
 				case bool:
 					b = strconv.AppendBool(b, f.Value.(bool))
 				default:

handlers/http/http_test.go

@@ -961,10 +961,12 @@ func getSyslogLoggerColorTests() []test {
 				log.F("key", uint16(3)),
 				log.F("key", uint32(4)),
 				log.F("key", uint64(5)),
+				log.F("key", float32(5.33)),
+				log.F("key", float64(5.34)),
 				log.F("key", true),
 				log.F("key", struct{ value string }{"struct"}),
 			},
-			want: "UTC [32m DEBUG[0m debug [32mkey[0m=string [32mkey[0m=1 [32mkey[0m=2 [32mkey[0m=3 [32mkey[0m=4 [32mkey[0m=5 [32mkey[0m=1 [32mkey[0m=2 [32mkey[0m=3 [32mkey[0m=4 [32mkey[0m=5 [32mkey[0m=true [32mkey[0m={struct}\n",
+			want: "UTC [32m DEBUG[0m debug [32mkey[0m=string [32mkey[0m=1 [32mkey[0m=2 [32mkey[0m=3 [32mkey[0m=4 [32mkey[0m=5 [32mkey[0m=1 [32mkey[0m=2 [32mkey[0m=3 [32mkey[0m=4 [32mkey[0m=5 [32mkey[0m=5.33 [32mkey[0m=5.34 [32mkey[0m=true [32mkey[0m={struct}\n",
 		},
 	}
 }

handlers/syslog/syslog.go

@@ -355,12 +355,19 @@ func (l *logger) SetCallerInfoLevels(levels ...Level) {
 }
 
 // SetCallerSkipDiff adds the provided diff to the caller SkipLevel values.
-// This is used when wrapping this library, you can set ths to increase the
+// This is used when wrapping this library, you can set this to increase the
 // skip values passed to Caller that retrieves the file + line number info.
 func (l *logger) SetCallerSkipDiff(diff uint8) {
 	skipLevel += int(diff)
 }
 
+// SetExitFunc sets the provided function as the exit function used in Fatal()
+// and Fatalf(). This is primarily used when wrapping this library, you can set
+// this to to enable testing (with coverage) of your Fatal() and Fatalf() methods.
+func (l *logger) SetExitFunc(fn func(code int)) {
+	exitFunc = fn
+}
+
 // HasHandlers returns if any handlers have been registered.
 func (l *logger) HasHandlers() bool {
 	return len(l.channels) != 0