diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-06-20 12:08:27 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-06-20 12:08:27 +0100 |
| commit | 0f947d683d6b3de552b563f785082fa7923fbb53 (patch) | |
| tree | f06fb27ff43565c272f64383203609f2fa55c3aa | |
| parent | a01372cf3d0a70a4e39cd3a43dce8d694f1e2aa9 (diff) | |
| download | build-coordinator-0f947d683d6b3de552b563f785082fa7923fbb53.tar build-coordinator-0f947d683d6b3de552b563f785082fa7923fbb53.tar.gz | |
Pass through the db connection in datastore-call-with-transaction
| -rw-r--r-- | guix-build-coordinator/build-allocator.scm | 2 | ||||
| -rw-r--r-- | guix-build-coordinator/datastore/sqlite.scm | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/guix-build-coordinator/build-allocator.scm b/guix-build-coordinator/build-allocator.scm index fda893c..58ae6ef 100644 --- a/guix-build-coordinator/build-allocator.scm +++ b/guix-build-coordinator/build-allocator.scm @@ -342,7 +342,7 @@ build-ids-for-unprocessed-builds-with-built-inputs) (datastore-call-with-transaction datastore - (lambda () + (lambda (db) (values (datastore-fetch-unprocessed-builds-with-propagated-priorities datastore) (datastore-list-unprocessed-builds-with-built-inputs datastore))) diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm index 6a49f19..6afa872 100644 --- a/guix-build-coordinator/datastore/sqlite.scm +++ b/guix-build-coordinator/datastore/sqlite.scm @@ -132,7 +132,7 @@ result)) (thunk))) -(define* (datastore-call-with-transaction datastore thunk +(define* (datastore-call-with-transaction datastore proc #:key readonly?) (call-with-worker-thread (slot-ref datastore (if readonly? @@ -149,7 +149,8 @@ (raise-exception exn)) (lambda () (call-with-values - thunk + (lambda () + (proc db)) (lambda vals (sqlite-exec db "COMMIT TRANSACTION;") (apply values vals)))) |