Merge pull request #1053 from AudriusButkevicius/symdis

Add option to disable symlinks (fixes #1017)
This commit is contained in:
Jakob Borg
2014-12-01 11:22:04 +01:00
5 changed files with 10 additions and 1 deletions

View File

@@ -45,6 +45,7 @@ import (
"github.com/syncthing/syncthing/internal/model"
"github.com/syncthing/syncthing/internal/osutil"
"github.com/syncthing/syncthing/internal/protocol"
"github.com/syncthing/syncthing/internal/symlinks"
"github.com/syncthing/syncthing/internal/upgrade"
"github.com/syncthing/syncthing/internal/upnp"
"github.com/syndtr/goleveldb/leveldb"
@@ -457,6 +458,10 @@ func syncthingMain() {
opts := cfg.Options()
if opts.DisableSymlinks {
symlinks.Supported = false
}
if opts.MaxSendKbps > 0 {
writeRateLimit = ratelimit.NewBucketWithRate(float64(1000*opts.MaxSendKbps), int64(5*1000*opts.MaxSendKbps))
}