diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-06-17 10:26:52 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-06-17 10:26:52 +0200 |
| commit | 1524752c17ee8753467f068c23fbe1d994aa8f75 (patch) | |
| tree | c802ca482e2461765dcbdcef5cc6fa38c9d1c42b /src/libstore/sqlite.cc | |
| parent | 7db879e65e83b1c65206b490d36a69e97c5a877a (diff) | |
| parent | 29542865cee37ab22efe1bd142900b69f6c59f0d (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/libstore/sqlite.cc')
| -rw-r--r-- | src/libstore/sqlite.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libstore/sqlite.cc b/src/libstore/sqlite.cc index a1c262f5f..31a1f0cac 100644 --- a/src/libstore/sqlite.cc +++ b/src/libstore/sqlite.cc @@ -29,7 +29,7 @@ SQLite::SQLite(const Path & path, bool create) { if (sqlite3_open_v2(path.c_str(), &db, SQLITE_OPEN_READWRITE | (create ? SQLITE_OPEN_CREATE : 0), 0) != SQLITE_OK) - throw Error(format("cannot open SQLite database '%s'") % path); + throw Error("cannot open SQLite database '%s'", path); if (sqlite3_busy_timeout(db, 60 * 60 * 1000) != SQLITE_OK) throwSQLiteError(db, "setting timeout"); @@ -209,7 +209,10 @@ void handleSQLiteBusy(const SQLiteBusy & e) if (now > lastWarned + 10) { lastWarned = now; - printError("warning: %s", e.what()); + logWarning({ + .name = "Sqlite busy", + .hint = hintfmt(e.what()) + }); } /* Sleep for a while since retrying the transaction right away |