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

Revert "provisioning: turn relative symlinked path into absolut paths"

Browse Source 
This reverts commit d089b5e05d.
This commit is contained in:
bergquist
2018-06-04 15:38:37 +02:00
parent d089b5e05d
commit cd4026da6b
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,25 +48,16 @@ func NewDashboardFileReader(cfg *DashboardsAsConfig, log log.Logger) (*fileReade
}
copy := path
// get absolut path of config file
path, err := filepath.Abs(path)
if err != nil {
log.Error("Could not create absolute path ", "path", path)
}
// follow the symlink to get the real path
path, err = filepath.EvalSymlinks(path)
if err != nil {
log.Error("Failed to read content of symlinked path: %s", path)
}
// get the absolut path in case the symlink is relative
path, err = filepath.Abs(path)
if err != nil {
log.Error("Could not create absolute path ", "path", path)
}
if path == "" {
path = copy
log.Info("falling back to original path due to EvalSymlink/Abs failure")