From b499bdea3b264f6a1ac67a37b226f7240e71bb53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 1 Oct 2014 11:37:04 +0200 Subject: [PATCH] working on panel rendering --- grafana | 2 +- pkg/api/api_render.go | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/grafana b/grafana index d584076b93b..de1de852fc1 160000 --- a/grafana +++ b/grafana @@ -1 +1 @@ -Subproject commit d584076b93b4ebfb33e5a5f375feb6d6ff7f9bfc +Subproject commit de1de852fc130d6b5c75c28a93aab38bbbe726b8 diff --git a/pkg/api/api_render.go b/pkg/api/api_render.go index ec03254938d..79911b7e09b 100644 --- a/pkg/api/api_render.go +++ b/pkg/api/api_render.go @@ -1,17 +1,20 @@ package api -import "github.com/gin-gonic/gin" +import ( + log "github.com/alecthomas/log4go" + "github.com/gin-gonic/gin" +) func init() { addRoutes(func(self *HttpServer) { - self.router.GET("/api/render", self.renderToPng) + self.router.GET("/api/render/*url", self.renderToPng) }) } func (self *HttpServer) renderToPng(c *gin.Context) { - qs := c.Request.URL.Query() - url := qs["url"][0] - pngPath, err := self.renderer.RenderToPng(url) + url := c.Params.ByName("url") + log.Info("Rendering url %v", url) + pngPath, err := self.renderer.RenderToPng("http://localhost:3000/" + url) if err != nil { c.HTML(500, "error.html", nil) }