Merge branch 'new-logger' into alerting_definitions

Conflicts: pkg/services/sqlstore/migrations/migrations_test.go

Merge branch 'new-logger' into alerting_definitions
Conflicts: pkg/services/sqlstore/migrations/migrations_test.go
e4ea24df · Torkel Ödegaard · d7c03359 · 73b0e6c3 · e4ea24df
Commit e4ea24df authored Jun 07, 2016 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

pkg/services/sqlstore/migrations/migrations_test.go
+2 -1

No files found.
--- a/pkg/services/sqlstore/migrations/migrations_test.go
+++ b/pkg/services/sqlstore/migrations/migrations_test.go
@@ -6,6 +6,7 @@ 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"
 	//"github.com/grafana/grafana/pkg/log"
@@ -29,7 +30,7 @@ func TestMigrations(t *testing.T) {
 			sqlutil.CleanDB(x)

 			mg := NewMigrator(x)
-			//mg.LogLevel = log.ERROR
+			mg.Logger.SetHandler(log15.DiscardHandler())
 			AddMigrations(mg)

 			err = mg.Start()