feat(loggin): disable logging by default so unit tests are not full of logging

torkelo · torkelo · commit 086b59483ece · 2016-06-11T11:38:25.000+02:00
diff --git a/pkg/log/log.go b/pkg/log/log.go
@@ -22,6 +22,7 @@ var loggersToClose []DisposableHandler
 func init() {
 	loggersToClose = make([]DisposableHandler, 0)
 	Root = log15.Root()
+	Root.SetHandler(log15.DiscardHandler())
 }
 
 func New(logger string, ctx ...interface{}) Logger {
diff --git a/pkg/middleware/quota.go b/pkg/middleware/quota.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
 	"gopkg.in/macaron.v1"
@@ -35,10 +34,8 @@ func QuotaReached(c *Context, target string) (bool, error) {
 		return false, err
 	}
 
-	log.Debug(fmt.Sprintf("checking quota for %s in scopes %v", target, scopes))
-
 	for _, scope := range scopes {
-		log.Debug(fmt.Sprintf("checking scope %s", scope.Name))
+		c.Logger.Debug("Checking quota", "target", target, "scope", scope)
 
 		switch scope.Name {
 		case "global":
@@ -51,7 +48,7 @@ func QuotaReached(c *Context, target string) (bool, error) {
 			if target == "session" {
 				usedSessions := getSessionCount()
 				if int64(usedSessions) > scope.DefaultLimit {
-					log.Debug(fmt.Sprintf("%d sessions active, limit is %d", usedSessions, scope.DefaultLimit))
+					c.Logger.Debug("Sessions limit reached", "active", usedSessions, "limit", scope.DefaultLimit)
 					return true, nil
 				}
 				continue
diff --git a/pkg/services/sqlstore/datasource_test.go b/pkg/services/sqlstore/datasource_test.go
@@ -12,8 +12,6 @@ import (
 )
 
 func InitTestDB(t *testing.T) {
-
-	t.Log("InitTestDB")
 	x, err := xorm.NewEngine(sqlutil.TestDB_Sqlite3.DriverName, sqlutil.TestDB_Sqlite3.ConnStr)
 	//x, err := xorm.NewEngine(sqlutil.TestDB_Mysql.DriverName, sqlutil.TestDB_Mysql.ConnStr)
 	//x, err := xorm.NewEngine(sqlutil.TestDB_Postgres.DriverName, sqlutil.TestDB_Postgres.ConnStr)
@@ -24,7 +22,7 @@ func InitTestDB(t *testing.T) {
 
 	sqlutil.CleanDB(x)
 
-	if err := SetEngine(x, false); err != nil {
+	if err := SetEngine(x); err != nil {
 		t.Fatal(err)
 	}
 }
diff --git a/pkg/services/sqlstore/migrations/migrations_test.go b/pkg/services/sqlstore/migrations/migrations_test.go
@@ -6,7 +6,6 @@ import (
 	"github.com/go-xorm/xorm"
 	. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
-	"github.com/inconshreveable/log15"
 
 	. "github.com/smartystreets/goconvey/convey"
 )
@@ -29,7 +28,6 @@ func TestMigrations(t *testing.T) {
 			sqlutil.CleanDB(x)
 
 			mg := NewMigrator(x)
-			mg.Logger.SetHandler(log15.DiscardHandler())
 			AddMigrations(mg)
 
 			err = mg.Start()
diff --git a/pkg/services/sqlstore/migrator/migrator.go b/pkg/services/sqlstore/migrator/migrator.go
@@ -107,7 +107,7 @@ func (mg *Migrator) Start() error {
 }
 
 func (mg *Migrator) exec(m Migration) error {
-	log.Info("Executing migration", "id", m.Id())
+	mg.Logger.Info("Executing migration", "id", m.Id())
 
 	err := mg.inTransaction(func(sess *xorm.Session) error {
 
diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go
@@ -78,15 +78,15 @@ func NewEngine() {
 		os.Exit(1)
 	}
 
-	err = SetEngine(x, setting.Env == setting.DEV)
+	err = SetEngine(x)
 
 	if err != nil {
 		sqlog.Error("Fail to initialize orm engine", "error", err)
 		os.Exit(1)
 	}
 }
 
-func SetEngine(engine *xorm.Engine, enableLog bool) (err error) {
+func SetEngine(engine *xorm.Engine) (err error) {
 	x = engine
 	dialect = migrator.NewDialect(x.DriverName())
 

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ var loggersToClose []DisposableHandler`
`22`	`22`	`func init() {`
`23`	`23`	`loggersToClose = make([]DisposableHandler, 0)`
`24`	`24`	`Root = log15.Root()`
	`25`	`+ Root.SetHandler(log15.DiscardHandler())`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`func New(logger string, ctx ...interface{}) Logger {`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ import (`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func InitTestDB(t *testing.T) {`
`15`		`-`
`16`		`- t.Log("InitTestDB")`
`17`	`15`	`x, err := xorm.NewEngine(sqlutil.TestDB_Sqlite3.DriverName, sqlutil.TestDB_Sqlite3.ConnStr)`
`18`	`16`	`//x, err := xorm.NewEngine(sqlutil.TestDB_Mysql.DriverName, sqlutil.TestDB_Mysql.ConnStr)`
`19`	`17`	`//x, err := xorm.NewEngine(sqlutil.TestDB_Postgres.DriverName, sqlutil.TestDB_Postgres.ConnStr)`
`@@ -24,7 +22,7 @@ func InitTestDB(t *testing.T) {`
`24`	`22`
`25`	`23`	`sqlutil.CleanDB(x)`
`26`	`24`
`27`		`- if err := SetEngine(x, false); err != nil {`
	`25`	`+ if err := SetEngine(x); err != nil {`
`28`	`26`	`t.Fatal(err)`
`29`	`27`	`}`
`30`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func (mg *Migrator) Start() error {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`func (mg *Migrator) exec(m Migration) error {`
`110`		`- log.Info("Executing migration", "id", m.Id())`
	`110`	`+ mg.Logger.Info("Executing migration", "id", m.Id())`
`111`	`111`
`112`	`112`	`err := mg.inTransaction(func(sess *xorm.Session) error {`
`113`	`113`
Original file line number	Diff line number	Diff line change
`@@ -78,15 +78,15 @@ func NewEngine() {`
`78`	`78`	`os.Exit(1)`
`79`	`79`	`}`
`80`	`80`
`81`		`- err = SetEngine(x, setting.Env == setting.DEV)`
	`81`	`+ err = SetEngine(x)`
`82`	`82`
`83`	`83`	`if err != nil {`
`84`	`84`	`sqlog.Error("Fail to initialize orm engine", "error", err)`
`85`	`85`	`os.Exit(1)`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
`89`		`-func SetEngine(engine *xorm.Engine, enableLog bool) (err error) {`
	`89`	`+func SetEngine(engine *xorm.Engine) (err error) {`
`90`	`90`	`x = engine`
`91`	`91`	`dialect = migrator.NewDialect(x.DriverName())`
`92`	`92`