octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-24 07:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2711 from calmh/fix2704

Browse Source 
Don't require restart for usage reporting changes (fixes #2704)
This commit is contained in:
Audrius Butkevicius 2016-01-18 18:12:58 +00:00
commit 1880284bde
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/model/model.go
View File

@ -1959,7 +1959,16 @@ func (m *Model) CommitConfiguration(from, to config.Configuration) bool {
} }
} }
// All of the generic options require restart // Some options don't require restart as those components handle it fine
// by themselves.
from.Options.URAccepted = to.Options.URAccepted
from.Options.URUniqueID = to.Options.URUniqueID
// All of the other generic options require restart. Or at least they may;
// removing this check requires going through those options carefully and
// making sure there are individual services that handle them correctly.
// This code is the "original" requires-restart check and protects other
// components that haven't yet been converted to VerifyConfig/CommitConfig
// handling.
if !reflect.DeepEqual(from.Options, to.Options) { if !reflect.DeepEqual(from.Options, to.Options) {
l.Debugln(m, "requires restart, options differ") l.Debugln(m, "requires restart, options differ")
return false return false