浏览代码

working on panel rendering

Torkel Ödegaard 11 年之前
父节点
当前提交
b499bdea3b
共有 2 个文件被更改,包括 9 次插入6 次删除
  1. 1 1
      grafana
  2. 8 5
      pkg/api/api_render.go

+ 1 - 1
grafana

@@ -1 +1 @@
-Subproject commit d584076b93b4ebfb33e5a5f375feb6d6ff7f9bfc
+Subproject commit de1de852fc130d6b5c75c28a93aab38bbbe726b8

+ 8 - 5
pkg/api/api_render.go

@@ -1,17 +1,20 @@
 package api
 package api
 
 
-import "github.com/gin-gonic/gin"
+import (
+	log "github.com/alecthomas/log4go"
+	"github.com/gin-gonic/gin"
+)
 
 
 func init() {
 func init() {
 	addRoutes(func(self *HttpServer) {
 	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) {
 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 {
 	if err != nil {
 		c.HTML(500, "error.html", nil)
 		c.HTML(500, "error.html", nil)
 	}
 	}