Skip to content

Commit 0ef6801

Browse files
torkelotorkelo
committed
Merge branch 'master' into alert_ui_take2
2 parents 77a5e3f + bf1ea56 commit 0ef6801

File tree

8 files changed

+49
-43
lines changed

8 files changed

+49
-43
lines changed

‎pkg/api/common.go

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"encoding/json"
55
"net/http"
66

7-
"github.com/grafana/grafana/pkg/log"
87
"github.com/grafana/grafana/pkg/metrics"
98
"github.com/grafana/grafana/pkg/middleware"
109
"github.com/grafana/grafana/pkg/setting"
@@ -21,13 +20,15 @@ var (
2120
)
2221

2322
type Response interface {
24-
WriteTo(out http.ResponseWriter)
23+
WriteTo(ctx *middleware.Context)
2524
}
2625

2726
type NormalResponse struct {
28-
status int
29-
body []byte
30-
header http.Header
27+
status int
28+
body []byte
29+
header http.Header
30+
errMessage string
31+
err error
3132
}
3233

3334
func wrap(action interface{}) macaron.Handler {
@@ -41,17 +42,21 @@ func wrap(action interface{}) macaron.Handler {
4142
res = ServerError(err)
4243
}
4344

44-
res.WriteTo(c.Resp)
45+
res.WriteTo(c)
4546
}
4647
}
4748

48-
func (r *NormalResponse) WriteTo(out http.ResponseWriter) {
49-
header := out.Header()
49+
func (r *NormalResponse) WriteTo(ctx *middleware.Context) {
50+
if r.err != nil {
51+
ctx.Logger.Error(r.errMessage, "error", r.err)
52+
}
53+
54+
header := ctx.Resp.Header()
5055
for k, v := range r.header {
5156
header[k] = v
5257
}
53-
out.WriteHeader(r.status)
54-
out.Write(r.body)
58+
ctx.Resp.WriteHeader(r.status)
59+
ctx.Resp.Write(r.body)
5560
}
5661

5762
func (r *NormalResponse) Cache(ttl string) *NormalResponse {
@@ -64,7 +69,6 @@ func (r *NormalResponse) Header(key, value string) *NormalResponse {
6469
}
6570

6671
// functions to create responses
67-
6872
func Empty(status int) *NormalResponse {
6973
return Respond(status, nil)
7074
}
@@ -80,29 +84,35 @@ func ApiSuccess(message string) *NormalResponse {
8084
}
8185

8286
func ApiError(status int, message string, err error) *NormalResponse {
83-
resp := make(map[string]interface{})
84-
85-
if err != nil {
86-
log.Error(4, "%s: %v", message, err)
87-
if setting.Env != setting.PROD {
88-
resp["error"] = err.Error()
89-
}
90-
}
87+
data := make(map[string]interface{})
9188

9289
switch status {
9390
case 404:
9491
metrics.M_Api_Status_404.Inc(1)
95-
resp["message"] = "Not Found"
92+
data["message"] = "Not Found"
9693
case 500:
9794
metrics.M_Api_Status_500.Inc(1)
98-
resp["message"] = "Internal Server Error"
95+
data["message"] = "Internal Server Error"
9996
}
10097

10198
if message != "" {
102-
resp["message"] = message
99+
data["message"] = message
100+
}
101+
102+
if err != nil {
103+
if setting.Env != setting.PROD {
104+
data["error"] = err.Error()
105+
}
106+
}
107+
108+
resp := Json(status, data)
109+
110+
if err != nil {
111+
resp.errMessage = message
112+
resp.err = err
103113
}
104114

105-
return Json(status, resp)
115+
return resp
106116
}
107117

108118
func Respond(status int, body interface{}) *NormalResponse {

‎pkg/log/log.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ var loggersToClose []DisposableHandler
2222
func init() {
2323
loggersToClose = make([]DisposableHandler, 0)
2424
Root = log15.Root()
25+
Root.SetHandler(log15.DiscardHandler())
2526
}
2627

2728
func New(logger string, ctx ...interface{}) Logger {

‎pkg/middleware/logger.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ func Logger() macaron.Handler {
4848

4949
if ctx, ok := c.Data["ctx"]; ok {
5050
ctxTyped := ctx.(*Context)
51-
ctxTyped.Logger.Info("Request Completed", "method", req.Method, "path", req.URL.Path, "status", status, "remote_addr", c.RemoteAddr(), "time_ns", timeTakenMs, "size", rw.Size())
51+
if status == 500 {
52+
ctxTyped.Logger.Error("Request Completed", "method", req.Method, "path", req.URL.Path, "status", status, "remote_addr", c.RemoteAddr(), "time_ns", timeTakenMs, "size", rw.Size())
53+
} else {
54+
ctxTyped.Logger.Info("Request Completed", "method", req.Method, "path", req.URL.Path, "status", status, "remote_addr", c.RemoteAddr(), "time_ns", timeTakenMs, "size", rw.Size())
55+
}
5256
}
5357
}
5458
}

‎pkg/middleware/middleware.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func initContextWithAnonymousUser(ctx *Context) bool {
8080
func initContextWithUserSessionCookie(ctx *Context) bool {
8181
// initialize session
8282
if err := ctx.Session.Start(ctx); err != nil {
83-
log.Error(3, "Failed to start session", err)
83+
ctx.Logger.Error("Failed to start session", "error", err)
8484
return false
8585
}
8686

@@ -91,7 +91,7 @@ func initContextWithUserSessionCookie(ctx *Context) bool {
9191

9292
query := m.GetSignedInUserQuery{UserId: userId}
9393
if err := bus.Dispatch(&query); err != nil {
94-
log.Error(3, "Failed to get user with id %v", userId)
94+
ctx.Logger.Error("Failed to get user with id", "userId", userId)
9595
return false
9696
} else {
9797
ctx.SignedInUser = query.Result
@@ -185,7 +185,7 @@ func initContextWithApiKeyFromSession(ctx *Context) bool {
185185

186186
keyQuery := m.GetApiKeyByIdQuery{ApiKeyId: keyId.(int64)}
187187
if err := bus.Dispatch(&keyQuery); err != nil {
188-
log.Error(3, "Failed to get api key by id", err)
188+
ctx.Logger.Error("Failed to get api key by id", "id", keyId, "error", err)
189189
return false
190190
} else {
191191
apikey := keyQuery.Result
@@ -202,7 +202,7 @@ func initContextWithApiKeyFromSession(ctx *Context) bool {
202202
// Handle handles and logs error by given status.
203203
func (ctx *Context) Handle(status int, title string, err error) {
204204
if err != nil {
205-
log.Error(4, "%s: %v", title, err)
205+
ctx.Logger.Error(title, "error", err)
206206
if setting.Env != setting.PROD {
207207
ctx.Data["ErrorMsg"] = err
208208
}
@@ -223,9 +223,7 @@ func (ctx *Context) Handle(status int, title string, err error) {
223223

224224
func (ctx *Context) JsonOK(message string) {
225225
resp := make(map[string]interface{})
226-
227226
resp["message"] = message
228-
229227
ctx.JSON(200, resp)
230228
}
231229

@@ -237,7 +235,7 @@ func (ctx *Context) JsonApiErr(status int, message string, err error) {
237235
resp := make(map[string]interface{})
238236

239237
if err != nil {
240-
log.Error(4, "%s: %v", message, err)
238+
ctx.Logger.Error(message, "error", err)
241239
if setting.Env != setting.PROD {
242240
resp["error"] = err.Error()
243241
}

‎pkg/middleware/quota.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"fmt"
55

66
"github.com/grafana/grafana/pkg/bus"
7-
"github.com/grafana/grafana/pkg/log"
87
m "github.com/grafana/grafana/pkg/models"
98
"github.com/grafana/grafana/pkg/setting"
109
"gopkg.in/macaron.v1"
@@ -35,10 +34,8 @@ func QuotaReached(c *Context, target string) (bool, error) {
3534
return false, err
3635
}
3736

38-
log.Debug(fmt.Sprintf("checking quota for %s in scopes %v", target, scopes))
39-
4037
for _, scope := range scopes {
41-
log.Debug(fmt.Sprintf("checking scope %s", scope.Name))
38+
c.Logger.Debug("Checking quota", "target", target, "scope", scope)
4239

4340
switch scope.Name {
4441
case "global":
@@ -51,7 +48,7 @@ func QuotaReached(c *Context, target string) (bool, error) {
5148
if target == "session" {
5249
usedSessions := getSessionCount()
5350
if int64(usedSessions) > scope.DefaultLimit {
54-
log.Debug(fmt.Sprintf("%d sessions active, limit is %d", usedSessions, scope.DefaultLimit))
51+
c.Logger.Debug("Sessions limit reached", "active", usedSessions, "limit", scope.DefaultLimit)
5552
return true, nil
5653
}
5754
continue

‎pkg/services/sqlstore/datasource_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import (
1212
)
1313

1414
func InitTestDB(t *testing.T) {
15-
16-
t.Log("InitTestDB")
1715
x, err := xorm.NewEngine(sqlutil.TestDB_Sqlite3.DriverName, sqlutil.TestDB_Sqlite3.ConnStr)
1816
//x, err := xorm.NewEngine(sqlutil.TestDB_Mysql.DriverName, sqlutil.TestDB_Mysql.ConnStr)
1917
//x, err := xorm.NewEngine(sqlutil.TestDB_Postgres.DriverName, sqlutil.TestDB_Postgres.ConnStr)
@@ -24,7 +22,7 @@ func InitTestDB(t *testing.T) {
2422

2523
sqlutil.CleanDB(x)
2624

27-
if err := SetEngine(x, false); err != nil {
25+
if err := SetEngine(x); err != nil {
2826
t.Fatal(err)
2927
}
3028
}

‎pkg/services/sqlstore/migrations/migrations_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"github.com/go-xorm/xorm"
77
. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
88
"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
9-
"github.com/inconshreveable/log15"
109

1110
. "github.com/smartystreets/goconvey/convey"
1211
//"github.com/grafana/grafana/pkg/log"
@@ -30,7 +29,6 @@ func TestMigrations(t *testing.T) {
3029
sqlutil.CleanDB(x)
3130

3231
mg := NewMigrator(x)
33-
mg.Logger.SetHandler(log15.DiscardHandler())
3432
AddMigrations(mg)
3533

3634
err = mg.Start()

‎pkg/services/sqlstore/sqlstore.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@ func NewEngine() {
7878
os.Exit(1)
7979
}
8080

81-
err = SetEngine(x, setting.Env == setting.DEV)
81+
err = SetEngine(x)
8282

8383
if err != nil {
8484
sqlog.Error("Fail to initialize orm engine", "error", err)
8585
os.Exit(1)
8686
}
8787
}
8888

89-
func SetEngine(engine *xorm.Engine, enableLog bool) (err error) {
89+
func SetEngine(engine *xorm.Engine) (err error) {
9090
x = engine
9191
dialect = migrator.NewDialect(x.DriverName())
9292

0 commit comments

Comments
 (0)