Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libstore/sqlite.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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())
});
}

Expand Down
8 changes: 2 additions & 6 deletions src/libutil/util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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 (...) { }
}
Expand All @@ -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());
}
}

Expand Down
Loading