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

provisioning: adds fallback if evalsymlink/abs fails

Browse Source
This commit is contained in:
bergquist 2018-06-04 09:04:33 +02:00
parent 3f5078339c
commit f606654c50
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/provisioning/dashboards/file_reader.go
View File

@ -51,7 +51,6 @@ func NewDashboardFileReader(cfg *DashboardsAsConfig, log log.Logger) (*fileReade
path, err := filepath.Abs(path)
if err != nil {
log.Error("Could not create absolute path ", "path", path)
path = copy //if .Abs return an error we fallback to path
}
path, err = filepath.EvalSymlinks(path)
@ -59,6 +58,11 @@ func NewDashboardFileReader(cfg *DashboardsAsConfig, log log.Logger) (*fileReade
log.Error("Failed to read content of symlinked path: %s", path)
}
if path == "" {
path = copy
log.Info("falling back to original path due to EvalSymlink/Abs failure")
}
return &fileReader{
Cfg: cfg,
Path: path,