Revert "Use WAL mode for SQLite cache databases"

grahamc · web-flow · commit 2b676c6e1368 · 2025-07-20T17:54:52.000-07:00
diff --git a/src/libstore/sqlite.cc b/src/libstore/sqlite.cc
@@ -93,7 +93,7 @@ SQLite::~SQLite()
 void SQLite::isCache()
 {
     exec("pragma synchronous = off");
-    exec("pragma main.journal_mode = wal");
+    exec("pragma main.journal_mode = truncate");
 }
 
 void SQLite::exec(const std::string & stmt)
@@ -250,7 +250,7 @@ void handleSQLiteBusy(const SQLiteBusy & e, time_t & nextWarning)
     if (now > nextWarning) {
         nextWarning = now + 10;
         logWarning({
-            .msg = e.info().msg
+            .msg = HintFmt(e.what())
         });
     }
 
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
@@ -190,10 +190,8 @@ void ignoreExceptionInDestructor(Verbosity lvl)
     try {
         try {
             throw;
-        } catch (Error & e) {
-            printMsg(lvl, ANSI_RED "error (ignored):" ANSI_NORMAL " %s", e.info().msg);
         } catch (std::exception & e) {
-            printMsg(lvl, ANSI_RED "error (ignored):" ANSI_NORMAL " %s", e.what());
+            printMsg(lvl, "error (ignored): %1%", e.what());
         }
     } catch (...) { }
 }
@@ -204,10 +202,8 @@ void ignoreExceptionExceptInterrupt(Verbosity lvl)
         throw;
     } catch (const Interrupted & e) {
         throw;
-    } catch (Error & e) {
-        printMsg(lvl, ANSI_RED "error (ignored):" ANSI_NORMAL " %s", e.info().msg);
     } catch (std::exception & e) {
-        printMsg(lvl, ANSI_RED "error (ignored):" ANSI_NORMAL " %s", e.what());
+        printMsg(lvl, "error (ignored): %1%", e.what());
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ SQLite::~SQLite()`
`93`	`93`	`void SQLite::isCache()`
`94`	`94`	`{`
`95`	`95`	`exec("pragma synchronous = off");`
`96`		`- exec("pragma main.journal_mode = wal");`
	`96`	`+ exec("pragma main.journal_mode = truncate");`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`void SQLite::exec(const std::string & stmt)`
`@@ -250,7 +250,7 @@ void handleSQLiteBusy(const SQLiteBusy & e, time_t & nextWarning)`
`250`	`250`	`if (now > nextWarning) {`
`251`	`251`	`nextWarning = now + 10;`
`252`	`252`	`logWarning({`
`253`		`- .msg = e.info().msg`
	`253`	`+ .msg = HintFmt(e.what())`
`254`	`254`	`});`
`255`	`255`	`}`
`256`	`256`
Original file line number	Diff line number	Diff line change
`@@ -190,10 +190,8 @@ void ignoreExceptionInDestructor(Verbosity lvl)`
`190`	`190`	`try {`
`191`	`191`	`try {`
`192`	`192`	`throw;`
`193`		`- } catch (Error & e) {`
`194`		`- printMsg(lvl, ANSI_RED "error (ignored):" ANSI_NORMAL " %s", e.info().msg);`
`195`	`193`	`} catch (std::exception & e) {`
`196`		`- printMsg(lvl, ANSI_RED "error (ignored):" ANSI_NORMAL " %s", e.what());`
	`194`	`+ printMsg(lvl, "error (ignored): %1%", e.what());`
`197`	`195`	`}`
`198`	`196`	`} catch (...) { }`
`199`	`197`	`}`
`@@ -204,10 +202,8 @@ void ignoreExceptionExceptInterrupt(Verbosity lvl)`
`204`	`202`	`throw;`
`205`	`203`	`} catch (const Interrupted & e) {`
`206`	`204`	`throw;`
`207`		`- } catch (Error & e) {`
`208`		`- printMsg(lvl, ANSI_RED "error (ignored):" ANSI_NORMAL " %s", e.info().msg);`
`209`	`205`	`} catch (std::exception & e) {`
`210`		`- printMsg(lvl, ANSI_RED "error (ignored):" ANSI_NORMAL " %s", e.what());`
	`206`	`+ printMsg(lvl, "error (ignored): %1%", e.what());`
`211`	`207`	`}`
`212`	`208`	`}`
`213`	`209`