IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Made it it compile again

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-11-20 09:16:28 +01:00
parent 41fb2b4cc4
commit 9b68911d00
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grafana

@ -1 +1 @@
Subproject commit 526e232c097eb45c484c9d1387813ff4f05d4a14
Subproject commit 2423f470ef62145c26e74511121eac01e554c363

3
pkg/middleware/middleware.go
View File

@ -2,7 +2,6 @@ package middleware
import (
"encoding/json"
"io/ioutil"
"strconv"
"github.com/Unknwon/macaron"
@ -81,7 +80,7 @@ func (ctx *Context) JsonApiErr(status int, message string, err error) {
}
func (ctx *Context) JsonBody(model interface{}) bool {
b, _ := ioutil.ReadAll(ctx.Req.Body)
b, _ := ctx.Req.Body().Bytes()
err := json.Unmarshal(b, &model)
return err == nil
}

2
pkg/routes/api/api_render.go
View File

@ -28,5 +28,5 @@ func RenderToPng(c *middleware.Context) {
}
c.Resp.Header().Set("Content-Type", "image/png")
http.ServeFile(c.Resp, c.Req, pngPath)
http.ServeFile(c.Resp, c.Req.Request, pngPath)
}

3
pkg/setting/setting.go
View File

@ -163,9 +163,6 @@ func initSessionService() {
SessionConfig.EnableSetCookie = Cfg.MustBool("session", "enable_set_cookie", true)
SessionConfig.Gclifetime = Cfg.MustInt64("session", "gc_interval_time", 86400)
SessionConfig.Maxlifetime = Cfg.MustInt64("session", "session_life_time", 86400)
SessionConfig.SessionIDHashFunc = Cfg.MustValueRange("session", "session_id_hashfunc",
"sha1", []string{"sha1", "sha256", "md5"})
SessionConfig.SessionIDHashKey = Cfg.MustValue("session", "session_id_hashkey", string(com.RandomCreateBytes(16)))
if SessionProvider == "file" {
os.MkdirAll(path.Dir(SessionConfig.ProviderConfig), os.ModePerm)