felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

cmd/syncthing: Don't crash when failing to create default config (fixes #6655) (#6658)

Browse Source 
This is not an ignorable error, because it can happen if we fail to
allocate a free port for the GUI or sync port on first startup.
This commit is contained in:
Jakob Borg
2020-05-17 07:56:24 +02:00
committed by GitHub
parent 1c5af3a4bd
commit 5c54d879a1
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/syncthing/main.go
+4 -1
View File
@@ -527,7 +527,10 @@ func (e errNoUpgrade) Error() string {
} }
func checkUpgrade() (upgrade.Release, error) { func checkUpgrade() (upgrade.Release, error) {
cfg, _ := loadOrDefaultConfig(protocol.EmptyDeviceID, events.NoopLogger) cfg, err := loadOrDefaultConfig(protocol.EmptyDeviceID, events.NoopLogger)
if err != nil {
return upgrade.Release{}, err
}
opts := cfg.Options() opts := cfg.Options()
release, err := upgrade.LatestRelease(opts.ReleasesURL, build.Version, opts.UpgradeToPreReleases) release, err := upgrade.LatestRelease(opts.ReleasesURL, build.Version, opts.UpgradeToPreReleases)
if err != nil { if err != nil {