diff --git a/pkg/api/common.go b/pkg/api/common.go index f8740201143..9d3ad90783b 100644 --- a/pkg/api/common.go +++ b/pkg/api/common.go @@ -4,7 +4,6 @@ import ( "encoding/json" "net/http" - "github.com/grafana/grafana/pkg/log" "github.com/grafana/grafana/pkg/metrics" "github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/setting" @@ -21,13 +20,15 @@ var ( ) type Response interface { - WriteTo(out http.ResponseWriter) + WriteTo(ctx *middleware.Context) } type NormalResponse struct { - status int - body []byte - header http.Header + status int + body []byte + header http.Header + errMessage string + err error } func wrap(action interface{}) macaron.Handler { @@ -41,17 +42,21 @@ func wrap(action interface{}) macaron.Handler { res = ServerError(err) } - res.WriteTo(c.Resp) + res.WriteTo(c) } } -func (r *NormalResponse) WriteTo(out http.ResponseWriter) { - header := out.Header() +func (r *NormalResponse) WriteTo(ctx *middleware.Context) { + if r.err != nil { + ctx.Logger.Error(r.errMessage, "error", r.err) + } + + header := ctx.Resp.Header() for k, v := range r.header { header[k] = v } - out.WriteHeader(r.status) - out.Write(r.body) + ctx.Resp.WriteHeader(r.status) + ctx.Resp.Write(r.body) } func (r *NormalResponse) Cache(ttl string) *NormalResponse { @@ -64,7 +69,6 @@ func (r *NormalResponse) Header(key, value string) *NormalResponse { } // functions to create responses - func Empty(status int) *NormalResponse { return Respond(status, nil) } @@ -80,29 +84,35 @@ func ApiSuccess(message string) *NormalResponse { } func ApiError(status int, message string, err error) *NormalResponse { - resp := make(map[string]interface{}) - - if err != nil { - log.Error(4, "%s: %v", message, err) - if setting.Env != setting.PROD { - resp["error"] = err.Error() - } - } + data := make(map[string]interface{}) switch status { case 404: metrics.M_Api_Status_404.Inc(1) - resp["message"] = "Not Found" + data["message"] = "Not Found" case 500: metrics.M_Api_Status_500.Inc(1) - resp["message"] = "Internal Server Error" + data["message"] = "Internal Server Error" } if message != "" { - resp["message"] = message + data["message"] = message } - return Json(status, resp) + if err != nil { + if setting.Env != setting.PROD { + data["error"] = err.Error() + } + } + + resp := Json(status, data) + + if err != nil { + resp.errMessage = message + resp.err = err + } + + return resp } func Respond(status int, body interface{}) *NormalResponse { diff --git a/pkg/log/log.go b/pkg/log/log.go index f74511e4f45..58f3cb89cab 100644 --- 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/logger.go b/pkg/middleware/logger.go index c39ae2b62b2..c6405ef80f9 100644 --- a/pkg/middleware/logger.go +++ b/pkg/middleware/logger.go @@ -48,7 +48,11 @@ func Logger() macaron.Handler { if ctx, ok := c.Data["ctx"]; ok { ctxTyped := ctx.(*Context) - ctxTyped.Logger.Info("Request Completed", "method", req.Method, "path", req.URL.Path, "status", status, "remote_addr", c.RemoteAddr(), "time_ns", timeTakenMs, "size", rw.Size()) + if status == 500 { + ctxTyped.Logger.Error("Request Completed", "method", req.Method, "path", req.URL.Path, "status", status, "remote_addr", c.RemoteAddr(), "time_ns", timeTakenMs, "size", rw.Size()) + } else { + ctxTyped.Logger.Info("Request Completed", "method", req.Method, "path", req.URL.Path, "status", status, "remote_addr", c.RemoteAddr(), "time_ns", timeTakenMs, "size", rw.Size()) + } } } } diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go index 3ca6f156341..5d52c68722e 100644 --- a/pkg/middleware/middleware.go +++ b/pkg/middleware/middleware.go @@ -80,7 +80,7 @@ func initContextWithAnonymousUser(ctx *Context) bool { func initContextWithUserSessionCookie(ctx *Context) bool { // initialize session if err := ctx.Session.Start(ctx); err != nil { - log.Error(3, "Failed to start session", err) + ctx.Logger.Error("Failed to start session", "error", err) return false } @@ -91,7 +91,7 @@ func initContextWithUserSessionCookie(ctx *Context) bool { query := m.GetSignedInUserQuery{UserId: userId} if err := bus.Dispatch(&query); err != nil { - log.Error(3, "Failed to get user with id %v", userId) + ctx.Logger.Error("Failed to get user with id", "userId", userId) return false } else { ctx.SignedInUser = query.Result @@ -185,7 +185,7 @@ func initContextWithApiKeyFromSession(ctx *Context) bool { keyQuery := m.GetApiKeyByIdQuery{ApiKeyId: keyId.(int64)} if err := bus.Dispatch(&keyQuery); err != nil { - log.Error(3, "Failed to get api key by id", err) + ctx.Logger.Error("Failed to get api key by id", "id", keyId, "error", err) return false } else { apikey := keyQuery.Result @@ -202,7 +202,7 @@ func initContextWithApiKeyFromSession(ctx *Context) bool { // Handle handles and logs error by given status. func (ctx *Context) Handle(status int, title string, err error) { if err != nil { - log.Error(4, "%s: %v", title, err) + ctx.Logger.Error(title, "error", err) if setting.Env != setting.PROD { ctx.Data["ErrorMsg"] = err } @@ -223,9 +223,7 @@ func (ctx *Context) Handle(status int, title string, err error) { func (ctx *Context) JsonOK(message string) { resp := make(map[string]interface{}) - resp["message"] = message - ctx.JSON(200, resp) } @@ -237,7 +235,7 @@ func (ctx *Context) JsonApiErr(status int, message string, err error) { resp := make(map[string]interface{}) if err != nil { - log.Error(4, "%s: %v", message, err) + ctx.Logger.Error(message, "error", err) if setting.Env != setting.PROD { resp["error"] = err.Error() } diff --git a/pkg/middleware/quota.go b/pkg/middleware/quota.go index d9e68f7560a..23f98e78a7e 100644 --- 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 index 4142602c472..b14c7ed9a24 100644 --- 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 index f959bf0ec8a..5bddf6ff605 100644 --- 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" //"github.com/grafana/grafana/pkg/log" @@ -30,7 +29,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/sqlstore.go b/pkg/services/sqlstore/sqlstore.go index 81b19717ddf..823a0b18421 100644 --- a/pkg/services/sqlstore/sqlstore.go +++ b/pkg/services/sqlstore/sqlstore.go @@ -78,7 +78,7 @@ 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) @@ -86,7 +86,7 @@ func NewEngine() { } } -func SetEngine(engine *xorm.Engine, enableLog bool) (err error) { +func SetEngine(engine *xorm.Engine) (err error) { x = engine dialect = migrator.NewDialect(x.DriverName())