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

lib/db: Undo adding user info to panic msgs (ref #7029) (#7040)

This commit is contained in:
Simon Frei 2020-10-19 08:40:37 +02:00 committed by GitHub
parent 23c935b05a
commit 01a7ef3b0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/db/lowlevel.go
View File

@ -817,7 +817,8 @@ func (db *Lowlevel) getMetaAndCheck(folder string) *metadataTracker {
var err error
defer func() {
if err != nil && !backend.IsClosed(err) {
warnAndPanic(err)
l.Warnf("Fatal error: %v", err)
obfuscateAndPanic(err)
}
}()
@ -945,14 +946,16 @@ func (db *Lowlevel) verifyLocalSequence(curSeq int64, folder string) bool {
t, err := db.newReadOnlyTransaction()
if err != nil {
warnAndPanic(err)
l.Warnf("Fatal error: %v", err)
obfuscateAndPanic(err)
}
ok := true
if err := t.withHaveSequence([]byte(folder), curSeq+1, func(fi protocol.FileIntf) bool {
ok = false // we got something, which we should not have
return false
}); err != nil && !backend.IsClosed(err) {
warnAndPanic(err)
l.Warnf("Fatal error: %v", err)
obfuscateAndPanic(err)
}
t.close()
@ -1165,8 +1168,6 @@ func unchanged(nf, ef protocol.FileIntf) bool {
var ldbPathRe = regexp.MustCompile(`(open|write|read) .+[\\/].+[\\/]index[^\\/]+[\\/][^\\/]+: `)
func warnAndPanic(err error) {
l.Warnf("Fatal error: %v", err)
msg := ldbPathRe.ReplaceAllString(err.Error(), "$1 x: ")
panic(msg)
func obfuscateAndPanic(err error) {
panic(ldbPathRe.ReplaceAllString(err.Error(), "$1 x: "))
}

3
lib/db/set.go
View File

@ -531,5 +531,6 @@ func fatalError(err error, opStr string, db *Lowlevel) {
}
}
}
warnAndPanic(fmt.Errorf("%v: %w:", opStr, err))
l.Warnf("Fatal error: %v: %v", opStr, err)
obfuscateAndPanic(err)
}