Merge lp:~pedronis/ubuntu-push/explicit-min-logger-be-kind-to-1.1 into lp:ubuntu-push

[Samuele Pedroni]

be explicit with the MinLogger interface, stops 1.1 compiler from exploding

this stops the 1.1 compiler to explode trying to compiler logger related stuff

[lp:~pedronis/ubuntu-push/explicit-min-logger-be-kind-to-1.1]

55. By Samuele Pedroni on 2014-02-06

fix comment

[John Lenton (chipaca)]

Ok. :)

review: Approve

=== modified file 'logger/logger.go'
--- logger/logger.go	2014-02-04 21:40:32 +0000
+++ logger/logger.go	2014-02-06 11:23:10 +0000
@@ -59,12 +59,15 @@
 	"debug": lDebug,
 }
 
+// MinimalLogger is the  minimal interface required to build a simple logger on top.
+type MinimalLogger interface {
+	Output(calldepth int, s string) error
+}
+
 // NewSimpleLoggerFromMinimalLogger creates a logger logging only up
 // to the given level. level can be in order: "error", "info",
 // "debug". It takes a value just implementing stlib Logger.Output().
-func NewSimpleLoggerFromMinimalLogger(minLog interface {
-	Output(calldepth int, s string) error
-}, level string) Logger {
+func NewSimpleLoggerFromMinimalLogger(minLog MinimalLogger, level string) Logger {
 	nlevel := levelToNLevel[level]
 	return &simpleLogger{
 		minLog.Output,

=== modified file 'testing/helpers.go'
--- testing/helpers.go	2014-02-04 22:30:42 +0000
+++ testing/helpers.go	2014-02-06 11:23:10 +0000
@@ -71,9 +71,7 @@
 }
 
 // NewTestLogger can be used in tests instead of NewSimpleLogger(FromMinimalLogger).
-func NewTestLogger(minLog interface {
-	Output(int, string) error
-}, level string) *TestLogger {
+func NewTestLogger(minLog logger.MinimalLogger, level string) *TestLogger {
 	h := &captureHelper{outputFunc: minLog.Output}
 	log := &TestLogger{
 		Logger: logger.NewSimpleLoggerFromMinimalLogger(h, level),