From 01a7ef3b0f840ea001fbab3faa36053af16cc3a1 Mon Sep 17 00:00:00 2001
From: Simon Frei <freisim93@gmail.com>
Date: Mon, 19 Oct 2020 08:40:37 +0200
Subject: [PATCH] lib/db: Undo adding user info to panic msgs (ref #7029)
 (#7040)

---
 lib/db/lowlevel.go | 15 ++++++++-------
 lib/db/set.go      |  3 ++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/db/lowlevel.go b/lib/db/lowlevel.go
index 314bdf2a3..c0c1b620c 100644
--- a/lib/db/lowlevel.go
+++ b/lib/db/lowlevel.go
@@ -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: "))
 }
diff --git a/lib/db/set.go b/lib/db/set.go
index a1c653754..e7759ef01 100644
--- a/lib/db/set.go
+++ b/lib/db/set.go
@@ -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)
 }