From de3df3009bf003f327d35e246d5904d93273e2e9 Mon Sep 17 00:00:00 2001
From: Ben Radford <benradf@users.noreply.github.com>
Date: Tue, 11 Apr 2023 16:03:37 +0100
Subject: [PATCH] Move warning timing logic into handleSQLiteBusy.

---
 src/libstore/sqlite.cc |  6 ++++--
 src/libstore/sqlite.hh | 13 ++-----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/libstore/sqlite.cc b/src/libstore/sqlite.cc
index c57e58fe0..df334c23c 100644
--- a/src/libstore/sqlite.cc
+++ b/src/libstore/sqlite.cc
@@ -239,9 +239,11 @@ SQLiteTxn::~SQLiteTxn()
     }
 }
 
-void handleSQLiteBusy(const SQLiteBusy & e, bool shouldWarn)
+void handleSQLiteBusy(const SQLiteBusy & e, time_t & nextWarning)
 {
-    if (shouldWarn) {
+    time_t now = time(0);
+    if (now > nextWarning) {
+        nextWarning = now + 10;
         logWarning({
             .msg = hintfmt(e.what())
         });
diff --git a/src/libstore/sqlite.hh b/src/libstore/sqlite.hh
index e2c9e28f8..6e14852cb 100644
--- a/src/libstore/sqlite.hh
+++ b/src/libstore/sqlite.hh
@@ -139,7 +139,7 @@ protected:
 
 MakeError(SQLiteBusy, SQLiteError);
 
-void handleSQLiteBusy(const SQLiteBusy & e, bool shouldWarn);
+void handleSQLiteBusy(const SQLiteBusy & e, time_t & nextWarning);
 
 /**
  * Convenience function for retrying a SQLite transaction when the
@@ -153,17 +153,8 @@ T retrySQLite(F && fun)
     while (true) {
         try {
             return fun();
-
         } catch (SQLiteBusy & e) {
-            time_t now = time(0);
-            bool shouldWarn = false;
-
-            if (now > nextWarning) {
-                nextWarning = now + 10;
-                shouldWarn = true;
-            }
-
-            handleSQLiteBusy(e, shouldWarn);
+            handleSQLiteBusy(e, nextWarning);
         }
     }
 }