octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-03 15:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/config: Update size constraints and URL (ref #3086)

Browse Source
This commit is contained in:
Jakob Borg 2016-05-13 14:02:47 +02:00
parent 62142c8ccd
commit b4f941784f
5 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/config/config.go
View File

@ -24,7 +24,7 @@ import (
const ( const (
OldestHandledVersion = 10 OldestHandledVersion = 10
CurrentVersion = 12 CurrentVersion = 13
MaxRescanIntervalS = 365 * 24 * 60 * 60 MaxRescanIntervalS = 365 * 24 * 60 * 60
) )
@ -185,6 +185,9 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
if cfg.Version == 11 { if cfg.Version == 11 {
convertV11V12(cfg) convertV11V12(cfg)
} }
if cfg.Version == 12 {
convertV12V13(cfg)
}
// Build a list of available devices // Build a list of available devices
existingDevices := make(map[protocol.DeviceID]bool) existingDevices := make(map[protocol.DeviceID]bool)
@ -234,6 +237,14 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
} }
} }
func convertV12V13(cfg *Configuration) {
if cfg.Options.ReleasesURL == "https://api.github.com/repos/syncthing/syncthing/releases?per_page=30" {
cfg.Options.ReleasesURL = "https://upgrades.syncthing.net/meta.json"
}
cfg.Version = 13
}
func convertV11V12(cfg *Configuration) { func convertV11V12(cfg *Configuration) {
// Change listen address schema // Change listen address schema
for i, addr := range cfg.Options.ListenAddress { for i, addr := range cfg.Options.ListenAddress {

2
lib/config/config_test.go
View File

@ -59,7 +59,7 @@ func TestDefaultValues(t *testing.T) {
URURL: "https://data.syncthing.net/newdata", URURL: "https://data.syncthing.net/newdata",
URInitialDelayS: 1800, URInitialDelayS: 1800,
URPostInsecurely: false, URPostInsecurely: false,
ReleasesURL: "https://api.github.com/repos/syncthing/syncthing/releases?per_page=30", ReleasesURL: "https://upgrades.syncthing.net/meta.json",
AlwaysLocalNets: []string{}, AlwaysLocalNets: []string{},
} }

2
lib/config/optionsconfiguration.go
View File

@ -37,7 +37,7 @@ type OptionsConfiguration struct {
SymlinksEnabled bool `xml:"symlinksEnabled" json:"symlinksEnabled" default:"true"` SymlinksEnabled bool `xml:"symlinksEnabled" json:"symlinksEnabled" default:"true"`
LimitBandwidthInLan bool `xml:"limitBandwidthInLan" json:"limitBandwidthInLan" default:"false"` LimitBandwidthInLan bool `xml:"limitBandwidthInLan" json:"limitBandwidthInLan" default:"false"`
MinHomeDiskFreePct float64 `xml:"minHomeDiskFreePct" json:"minHomeDiskFreePct" default:"1"` MinHomeDiskFreePct float64 `xml:"minHomeDiskFreePct" json:"minHomeDiskFreePct" default:"1"`
ReleasesURL string `xml:"releasesURL" json:"releasesURL" default:"https://api.github.com/repos/syncthing/syncthing/releases?per_page=30"` ReleasesURL string `xml:"releasesURL" json:"releasesURL" default:"https://upgrades.syncthing.net/meta.json"`
AlwaysLocalNets []string `xml:"alwaysLocalNet" json:"alwaysLocalNets"` AlwaysLocalNets []string `xml:"alwaysLocalNet" json:"alwaysLocalNets"`
} }

14
lib/config/testdata/v13.xml vendored Normal file
View File

@ -0,0 +1,14 @@
<configuration version="13">
<folder id="test" path="testdata" ro="true" ignorePerms="false" rescanIntervalS="600" autoNormalize="true">
<device id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR"></device>
<device id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2"></device>
<minDiskFreePct>1</minDiskFreePct>
<maxConflicts>-1</maxConflicts>
</folder>
<device id="AIR6LPZ-7K4PTTV-UXQSMUU-CPQ5YWH-OEDFIIQ-JUG777G-2YQXXR5-YD6AWQR" name="node one" compression="metadata">
<address>tcp://a</address>
</device>
<device id="P56IOI7-MZJNU2Y-IQGDREY-DM2MGTI-MGL3BXN-PQ6W5BM-TBBZ4TJ-XZWICQ2" name="node two" compression="metadata">
<address>tcp://b</address>
</device>
</configuration>

4
lib/upgrade/upgrade_supported.go
View File

@ -39,7 +39,7 @@ const (
maxBinarySize = 64 << 20 // 64 MiB maxBinarySize = 64 << 20 // 64 MiB
// The max expected size of the signature file. // The max expected size of the signature file.
maxSignatureSize = 1 << 10 // 1 KiB maxSignatureSize = 10 << 10 // 10 KiB
// We set the same limit on the archive. The binary will compress and we // We set the same limit on the archive. The binary will compress and we
// include som other stuff - currently the release archive size is // include som other stuff - currently the release archive size is
@ -55,7 +55,7 @@ const (
readTimeout = 30 * time.Minute readTimeout = 30 * time.Minute
// The limit on the size of metadata that we accept. // The limit on the size of metadata that we accept.
maxMetadataSize = 100 << 10 // 100 KiB maxMetadataSize = 10 << 20 // 10 MiB
) )
// This is an HTTP/HTTPS client that does *not* perform certificate // This is an HTTP/HTTPS client that does *not* perform certificate