Browse Source

Merge pull request #10548 from StevenTobin/follow_symlinks

Make file_reader follow symlinks
Carl Bergquist 8 years ago
parent
commit
d6667c4fa0
1 changed files with 11 additions and 0 deletions
  1. 11 0
      pkg/services/provisioning/dashboards/file_reader.go

+ 11 - 0
pkg/services/provisioning/dashboards/file_reader.go

@@ -151,6 +151,17 @@ func createWalkFn(fr *fileReader, folderId int64) filepath.WalkFunc {
 			return nil
 		}
 
+		checkFilepath, err := filepath.EvalSymlinks(path)
+
+		if path != checkFilepath {
+			path = checkFilepath
+			fi, err := os.Lstat(checkFilepath)
+			if err != nil {
+				return err
+			}
+			fileInfo = fi
+		}
+
 		cachedDashboard, exist := fr.cache.getCache(path)
 		if exist && cachedDashboard.UpdatedAt == fileInfo.ModTime() {
 			return nil