mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Merge pull request #14482 from joesis/logging-provisioning-file-reader
log error when resolvePath
This commit is contained in:
commit
82adf5393e
@ -333,12 +333,12 @@ func (fr *fileReader) resolvePath(path string) string {
|
|||||||
copy := path
|
copy := path
|
||||||
path, err := filepath.Abs(path)
|
path, err := filepath.Abs(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fr.log.Error("Could not create absolute path ", "path", path)
|
fr.log.Error("Could not create absolute path", "path", copy, "error", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
path, err = filepath.EvalSymlinks(path)
|
path, err = filepath.EvalSymlinks(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fr.log.Error("Failed to read content of symlinked path: %s", path)
|
fr.log.Error("Failed to read content of symlinked path", "path", copy, "error", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if path == "" {
|
if path == "" {
|
||||||
|
Loading…
Reference in New Issue
Block a user