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

cmd/syncthing: Error handling on upgrade (#7497)

Browse Source 
dat innocuous little colon
This commit is contained in:
Jakob Borg
2021-03-17 22:52:43 +01:00
committed by GitHub
parent 6c573a5762
commit ea701a4e9e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/syncthing/main.go
+3 -1
View File
@@ -38,6 +38,7 @@ import (
"github.com/syncthing/syncthing/lib/build" "github.com/syncthing/syncthing/lib/build"
"github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/config"
"github.com/syncthing/syncthing/lib/db" "github.com/syncthing/syncthing/lib/db"
"github.com/syncthing/syncthing/lib/db/backend"
"github.com/syncthing/syncthing/lib/dialer" "github.com/syncthing/syncthing/lib/dialer"
"github.com/syncthing/syncthing/lib/events" "github.com/syncthing/syncthing/lib/events"
"github.com/syncthing/syncthing/lib/fs" "github.com/syncthing/syncthing/lib/fs"
@@ -392,7 +393,8 @@ func (options serveOptions) Run() error {
release, err := checkUpgrade() release, err := checkUpgrade()
if err == nil { if err == nil {
// Use leveldb database locks to protect against concurrent upgrades // Use leveldb database locks to protect against concurrent upgrades
ldb, err := syncthing.OpenDBBackend(locations.Get(locations.Database), config.TuningAuto) var ldb backend.Backend
ldb, err = syncthing.OpenDBBackend(locations.Get(locations.Database), config.TuningAuto)
if err != nil { if err != nil {
err = upgradeViaRest() err = upgradeViaRest()
} else { } else {