summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAudrius Butkevicius <audrius.butkevicius@gmail.com>2015-08-14 10:42:01 +0100
committerAudrius Butkevicius <audrius.butkevicius@gmail.com>2015-08-14 10:42:01 +0100
commit7a9bb65e03e0730b792a42ba64727edfc641f1ba (patch)
treed9e00168a5a1395370a0fd272f84360fc2f6e911
parentae5079f7b45ef3da04c78b5b52b63e47d69c9b69 (diff)
parenta5345ac71e94b4d6baa19c10f1d6aaa87a0eb235 (diff)
Merge pull request #2156 from calmh/stuckatzero
Don't get stuck at "Syncing 0%" when adding a new folder
-rwxr-xr-xgui/syncthing/core/syncthingController.js1
-rw-r--r--lib/auto/gui.files.go4
-rw-r--r--lib/config/config.go6
-rw-r--r--lib/config/config_test.go4
-rw-r--r--lib/model/rwfolder.go16
5 files changed, 20 insertions, 11 deletions
diff --git a/gui/syncthing/core/syncthingController.js b/gui/syncthing/core/syncthingController.js
index dd590fd33..a3d847276 100755
--- a/gui/syncthing/core/syncthingController.js
+++ b/gui/syncthing/core/syncthingController.js
@@ -1079,6 +1079,7 @@ angular.module('syncthing.core')
selectedDevices: {},
rescanIntervalS: 60,
minDiskFreePct: 1,
+ order: "random",
fileVersioningSelector: "none",
trashcanClean: 0,
simpleKeep: 5,
diff --git a/lib/auto/gui.files.go b/lib/auto/gui.files.go
index 279f140a7..992d62230 100644
--- a/lib/auto/gui.files.go
+++ b/lib/auto/gui.files.go
@@ -5,7 +5,7 @@ import (
)
const (
- AssetsBuildDate = "Fri, 14 Aug 2015 07:13:00 GMT"
+ AssetsBuildDate = "Fri, 14 Aug 2015 07:36:16 GMT"
)
func Assets() map[string][]byte {
@@ -78,7 +78,7 @@ func Assets() map[string][]byte {
assets["syncthing/core/selectOnClickDirective.js"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/3SQQWvEIBCF7/srPBRiIEjPXXooe2+hPZYeRKeprJkpo2YpJf+9atLdJWzeSZ/z+Z5q7JPXrAayyYNswg+a+OWwV4YYmnYnspR1DCa6sQyAz8sXPHhnjk0nPlMGHKGQdyeHlk6t+K1QEUNMjFdGkXd4fLjigqFv6ES+dwCMndAxcmhXUNEyoQhlY1bx8hZQNGoWc+cS9iiWlqqH+PZvy3a/yXL+IcicJZNqumHQEV6LvcVVRs2pz2ThQBgzGuTygvf7jw3y3FQxDDTCk/c1KWxFXQBt7Vyqpt8Yn1bedN5N+105/AMAAP//AQAA//+SF+4JDAIAAA==")
assets["syncthing/core/shutdownDialogDirective.js"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/1SOwQqDQAxE737F3qIg672eCv2F9r6sqQZitsRspRT/vdqC1DnOTDIvSJ85qB9TlxlLmF4SbSDpfUyKUBVule9IMRo9t8KQrUuzXChw6qF297xeUBJXVu79rW9StKzyZ/zMyZSinRycoT5EhuODg+FVeU13imajaI6bN8LZDzYy7B+WtliqtvgAAAD//wEAAP//3qFOo80AAAA=")
assets["syncthing/core/shutdownDialogView.html"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/0TOTaqDMBAH8PXzFMNsXL16gZhNj+AJ0jjWQJwJzgQp1ru3lkK3P/h/uEXGkCGNPepcbZSNEdSCVX1LjZFUEVIU7rHIRuu/TBOCJcvU4763wzcFV1lKJqMWnmBrYM3B6DjQN3+u/MQPD442J77DHBRuRAznMpwlF9cV37juc8o3LwAAAP//AQAA//99X8KxnQAAAA==")
- assets["syncthing/core/syncthingController.js"], _ = base64.StdEncoding.DecodeString("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")
+ assets["syncthing/core/syncthingController.js"], _ = base64.StdEncoding.DecodeString("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")
assets["syncthing/core/uniqueFolderDirective.js"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/7SSwW4yMQyE7zyFD7+0IK3CHc5/b1V74h5tvKzVkIDtQFHFuzdhUaGwtJWqzgVp4vkYW2vDMnnLZhVd8jiuZB8a7SgsTRMZq8kIsowjxkZpmwdSoE3Ch+gdclVDm/I8xQDjCbwdh4sYNXG4MHpzkzJnBlVYPkaHvqo/vXsKL7MLoDRxjTWgX9VgVVlqaJT95ApbVHzzb21ZkMWkIB21Oj6jtoS7hfUJh8JF1J7+z6Ajzev/fyUpv/cCRdMp7BCki8m7UClsrSdnFe8G+pqCuiiTpPubcyrnjvNBwCFfQvCiaXsMiemsPO3CM2ePM/K86zfdtUPoGYBlWwHrGa3b/6J/a3PHrxf4aScS6OF/dM5B9/ThftzwNnu44p05h/moPL4DAAD//wEAAP//r65WJ1IDAAA=")
assets["syncthing/core/upgradingDialogDirective.js"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/1yOwQrCMBBE7/2K3LaFkt7tSfAX9B7SNV3YJmW7UUT676YKRZ3jzNudcTFkdmKnNGTGGpZH9DpSDNYnQWgqU2QHEvRKtwLkOYgbCnAixylAa665nFCKpm7M881vEtQs8cv4mIsKeT0YOEL7EylOMzvFs3BJ9xndNqP7K70Q3u2oE8P+Yu2rtemrFwAAAP//AQAA//99zQ2GzwAAAA==")
assets["syncthing/core/upgradingDialogView.html"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/1zOTarDMAwE4PXLKYQ2WSW5gO0zPCg9gHDcVODaxlIIJc3dm5b+QLfDN8yYSx4pAo8W5zJVGjlNCKKks1jkdMoI7HOySLXmpfNcfQzdXBCUNQaL69oe380WbqCVkkTSsG3omj9TnJFC6Zu7wzV5Pe8cWOCz2pvh4Rz88v8YSAIsxPoifb/j4hozPN+75g4AAP//AQAA///kaeW6xgAAAA==")
diff --git a/lib/config/config.go b/lib/config/config.go
index c6a7f7d1d..7abca84ef 100644
--- a/lib/config/config.go
+++ b/lib/config/config.go
@@ -404,12 +404,6 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
cfg.Folders[i].Devices = ensureDevicePresent(cfg.Folders[i].Devices, myID)
cfg.Folders[i].Devices = ensureExistingDevices(cfg.Folders[i].Devices, existingDevices)
cfg.Folders[i].Devices = ensureNoDuplicates(cfg.Folders[i].Devices)
- if cfg.Folders[i].Copiers == 0 {
- cfg.Folders[i].Copiers = 1
- }
- if cfg.Folders[i].Pullers == 0 {
- cfg.Folders[i].Pullers = 16
- }
sort.Sort(FolderDeviceConfigurationList(cfg.Folders[i].Devices))
}
diff --git a/lib/config/config_test.go b/lib/config/config_test.go
index f9f35e325..0a8b39423 100644
--- a/lib/config/config_test.go
+++ b/lib/config/config_test.go
@@ -89,8 +89,8 @@ func TestDeviceConfig(t *testing.T) {
Devices: []FolderDeviceConfiguration{{DeviceID: device1}, {DeviceID: device4}},
ReadOnly: true,
RescanIntervalS: 600,
- Copiers: 1,
- Pullers: 16,
+ Copiers: 0,
+ Pullers: 0,
Hashers: 0,
AutoNormalize: true,
MinDiskFreePct: 1,
diff --git a/lib/model/rwfolder.go b/lib/model/rwfolder.go
index 8abfb95e1..629ba7270 100644
--- a/lib/model/rwfolder.go
+++ b/lib/model/rwfolder.go
@@ -66,6 +66,11 @@ const (
dbUpdateShortcutFile
)
+const (
+ defaultCopiers = 1
+ defaultPullers = 16
+)
+
type dbUpdateJob struct {
file protocol.FileInfo
jobType int
@@ -102,7 +107,7 @@ type rwFolder struct {
}
func newRWFolder(m *Model, shortID uint64, cfg config.FolderConfiguration) *rwFolder {
- return &rwFolder{
+ p := &rwFolder{
stateTracker: stateTracker{
folder: cfg.ID,
mut: sync.NewMutex(),
@@ -131,6 +136,15 @@ func newRWFolder(m *Model, shortID uint64, cfg config.FolderConfiguration) *rwFo
errorsMut: sync.NewMutex(),
}
+
+ if p.copiers == 0 {
+ p.copiers = defaultCopiers
+ }
+ if p.pullers == 0 {
+ p.pullers = defaultPullers
+ }
+
+ return p
}
// Helper function to check whether either the ignorePerm flag has been