Преглед изворни кода

provisioning: adds fallback if evalsymlink/abs fails

bergquist пре 7 година
родитељ
комит
f606654c50
1 измењених фајлова са 5 додато и 1 уклоњено
  1. 5 1
      pkg/services/provisioning/dashboards/file_reader.go

+ 5 - 1
pkg/services/provisioning/dashboards/file_reader.go

@@ -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,