X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fsyncthing%2Fstfolder.go;h=661e19deab8c0fa423696070f018b81156b07fe8;hb=ab1170e65d6d03dd1eb2542b5fc47694d7785e70;hp=45ac60deb4e071bc92f647d30ca83d9cee01adbc;hpb=2c9ae6a5a27ae2f2e23495c613e7a53aed8e786c;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/syncthing/stfolder.go b/lib/syncthing/stfolder.go
index 45ac60d..661e19d 100644
--- a/lib/syncthing/stfolder.go
+++ b/lib/syncthing/stfolder.go
@@ -55,7 +55,11 @@ func (s *SyncThing) FolderChange(f xdsconfig.FolderConfig) error {
 	folder := config.FolderConfiguration{
 		ID:      id,
 		Label:   label,
-		RawPath: filepath.Join(s.conf.ShareRootDir, f.RelativePath),
+		RawPath: filepath.Join(s.conf.FileConf.ShareRootDir, f.RelativePath),
+	}
+
+	if s.conf.FileConf.SThgConf.RescanIntervalS > 0 {
+		folder.RescanIntervalS = s.conf.FileConf.SThgConf.RescanIntervalS
 	}
 
 	folder.Devices = append(folder.Devices, config.FolderDeviceConfiguration{