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

Merge branch 'v4.4.x'

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-07-31 16:04:31 +02:00
commit c7c5730c40
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/render.go
View File

@ -18,14 +18,18 @@ func RenderToPng(c *middleware.Context) {
Width: queryReader.Get("width", "800"), Width: queryReader.Get("width", "800"),
Height: queryReader.Get("height", "400"), Height: queryReader.Get("height", "400"),
OrgId: c.OrgId, OrgId: c.OrgId,
Timeout: queryReader.Get("timeout", "30"), Timeout: queryReader.Get("timeout", "60"),
Timezone: queryReader.Get("tz", ""), Timezone: queryReader.Get("tz", ""),
} }
pngPath, err := renderer.RenderToPng(renderOpts) pngPath, err := renderer.RenderToPng(renderOpts)
if err != nil { if err != nil {
c.Handle(500, "Failed to render to png", err) if err == renderer.ErrTimeout {
c.Handle(500, err.Error(), err)
}
c.Handle(500, "Rendering failed.", err)
return return
} }

15
pkg/components/renderer/renderer.go
View File

@ -1,6 +1,7 @@
package renderer package renderer
import ( import (
"errors"
"fmt" "fmt"
"io" "io"
"os" "os"
@ -28,6 +29,7 @@ type RenderOpts struct {
Timezone string Timezone string
} }
var ErrTimeout = errors.New("Timeout error. You can set timeout in seconds with &timeout url parameter")
var rendererLog log.Logger = log.New("png-renderer") var rendererLog log.Logger = log.New("png-renderer")
func isoTimeOffsetToPosixTz(isoOffset string) string { func isoTimeOffsetToPosixTz(isoOffset string) string {
@ -75,6 +77,11 @@ func RenderToPng(params *RenderOpts) (string, error) {
renderKey := middleware.AddRenderAuthKey(params.OrgId) renderKey := middleware.AddRenderAuthKey(params.OrgId)
defer middleware.RemoveRenderAuthKey(renderKey) defer middleware.RemoveRenderAuthKey(renderKey)
timeout, err := strconv.Atoi(params.Timeout)
if err != nil {
timeout = 15
}
cmdArgs := []string{ cmdArgs := []string{
"--ignore-ssl-errors=true", "--ignore-ssl-errors=true",
"--web-security=false", "--web-security=false",
@ -84,6 +91,7 @@ func RenderToPng(params *RenderOpts) (string, error) {
"height=" + params.Height, "height=" + params.Height,
"png=" + pngPath, "png=" + pngPath,
"domain=" + localDomain, "domain=" + localDomain,
"timeout=" + strconv.Itoa(timeout),
"renderKey=" + renderKey, "renderKey=" + renderKey,
} }
@ -117,17 +125,12 @@ func RenderToPng(params *RenderOpts) (string, error) {
close(done) close(done)
}() }()
timeout, err := strconv.Atoi(params.Timeout)
if err != nil {
timeout = 15
}
select { select {
case <-time.After(time.Duration(timeout) * time.Second): case <-time.After(time.Duration(timeout) * time.Second):
if err := cmd.Process.Kill(); err != nil { if err := cmd.Process.Kill(); err != nil {
rendererLog.Error("failed to kill", "error", err) rendererLog.Error("failed to kill", "error", err)
} }
return "", fmt.Errorf("PhantomRenderer::renderToPng timeout (>%vs)", timeout) return "", ErrTimeout
case <-done: case <-done:
} }

17
vendor/phantomjs/render.js vendored
View File

@ -30,10 +30,12 @@
height: params.height || '400' height: params.height || '400'
}; };
var tries = 0; var timeoutMs = (parseInt(params.timeout) || 10) * 1000;
var waitBetweenReadyCheckMs = 50;
var totalWaitMs = 0;
page.open(params.url, function (status) { page.open(params.url, function (status) {
// console.log('Loading a web page: ' + params.url + ' status: ' + status); console.log('Loading a web page: ' + params.url + ' status: ' + status, timeoutMs);
page.onError = function(msg, trace) { page.onError = function(msg, trace) {
var msgStack = ['ERROR: ' + msg]; var msgStack = ['ERROR: ' + msg];
@ -59,7 +61,7 @@
return rootScope.panelsRendered >= panels; return rootScope.panelsRendered >= panels;
}); });
if (panelsRendered || tries === 1000) { if (panelsRendered || totalWaitMs > timeoutMs) {
var bb = page.evaluate(function () { var bb = page.evaluate(function () {
return document.getElementsByClassName("main-view")[0].getBoundingClientRect(); return document.getElementsByClassName("main-view")[0].getBoundingClientRect();
}); });
@ -73,13 +75,12 @@
page.render(params.png); page.render(params.png);
phantom.exit(); phantom.exit();
} } else {
else { totalWaitMs += waitBetweenReadyCheckMs;
tries++; setTimeout(checkIsReady, waitBetweenReadyCheckMs);
setTimeout(checkIsReady, 10);
} }
} }
setTimeout(checkIsReady, 200); setTimeout(checkIsReady, waitBetweenReadyCheckMs);
}); });
})(); })();