octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-02 03:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/config: Round times stored for pending folders/devices (fixes #5554)

Browse Source
This commit is contained in:
Jakob Borg 2019-03-27 20:35:42 +01:00
parent bf3834e367
commit f0f8bf7784
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/config/wrapper.go
View File

@ -482,7 +482,7 @@ func (w *wrapper) AddOrUpdatePendingDevice(device protocol.DeviceID, name, addre
for i := range w.cfg.PendingDevices { for i := range w.cfg.PendingDevices {
if w.cfg.PendingDevices[i].ID == device { if w.cfg.PendingDevices[i].ID == device {
w.cfg.PendingDevices[i].Time = time.Now() w.cfg.PendingDevices[i].Time = time.Now().Round(time.Second)
w.cfg.PendingDevices[i].Name = name w.cfg.PendingDevices[i].Name = name
w.cfg.PendingDevices[i].Address = address w.cfg.PendingDevices[i].Address = address
return return
@ -490,7 +490,7 @@ func (w *wrapper) AddOrUpdatePendingDevice(device protocol.DeviceID, name, addre
} }
w.cfg.PendingDevices = append(w.cfg.PendingDevices, ObservedDevice{ w.cfg.PendingDevices = append(w.cfg.PendingDevices, ObservedDevice{
Time: time.Now(), Time: time.Now().Round(time.Second),
ID: device, ID: device,
Name: name, Name: name,
Address: address, Address: address,
@ -508,12 +508,12 @@ func (w *wrapper) AddOrUpdatePendingFolder(id, label string, device protocol.Dev
for j := range w.cfg.Devices[i].PendingFolders { for j := range w.cfg.Devices[i].PendingFolders {
if w.cfg.Devices[i].PendingFolders[j].ID == id { if w.cfg.Devices[i].PendingFolders[j].ID == id {
w.cfg.Devices[i].PendingFolders[j].Label = label w.cfg.Devices[i].PendingFolders[j].Label = label
w.cfg.Devices[i].PendingFolders[j].Time = time.Now() w.cfg.Devices[i].PendingFolders[j].Time = time.Now().Round(time.Second)
return return
} }
} }
w.cfg.Devices[i].PendingFolders = append(w.cfg.Devices[i].PendingFolders, ObservedFolder{ w.cfg.Devices[i].PendingFolders = append(w.cfg.Devices[i].PendingFolders, ObservedFolder{
Time: time.Now(), Time: time.Now().Round(time.Second),
ID: id, ID: id,
Label: label, Label: label,
}) })