Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmd/syncthing: Don't rewrite config on startup unless necessary (#5399)

This commit is contained in:
Jakob Borg 2018-12-21 15:26:36 +01:00 committed by Audrius Butkevicius
parent 99c9d65ddf
commit c8123bda28
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/syncthing/main.go
View File

@ -840,13 +840,16 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
if opts := cfg.Options(); IsCandidate {
l.Infoln("Anonymous usage reporting is always enabled for candidate releases.")
opts.URAccepted = usageReportVersion
cfg.SetOptions(opts)
cfg.Save()
// Unique ID will be set and config saved below if necessary.
if opts.URAccepted != usageReportVersion {
opts.URAccepted = usageReportVersion
cfg.SetOptions(opts)
cfg.Save()
// Unique ID will be set and config saved below if necessary.
}
}
if opts := cfg.Options(); opts.URUniqueID == "" {
// If we are going to do usage reporting, ensure we have a valid unique ID.
if opts := cfg.Options(); opts.URAccepted > 0 && opts.URUniqueID == "" {
opts.URUniqueID = rand.String(8)
cfg.SetOptions(opts)
cfg.Save()