aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2020-02-15 13:42:52 +0000
committerChristopher Baines <mail@cbaines.net>2020-02-15 16:49:37 +0000
commit40f6de27f6168c160f65b1334fd3cf7d586949be (patch)
tree5ecf0d58d9fcdb34916e5d19cc7c5af42be84e48
parent46c8ce5b82507b6b58429f3de28012ebe2f8694d (diff)
downloaddata-service-40f6de27f6168c160f65b1334fd3cf7d586949be.tar
data-service-40f6de27f6168c160f65b1334fd3cf7d586949be.tar.gz
Make deleting the existing log parts optional
-rw-r--r--guix-data-service/jobs/load-new-guix-revision.scm19
1 files changed, 11 insertions, 8 deletions
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index cf18c62..9fef9c5 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -65,7 +65,7 @@
enqueue-load-new-guix-revision-job
most-recent-n-load-new-guix-revision-jobs))
-(define (log-port job-id conn)
+(define* (log-port job-id conn #:key delete-existing-log-parts?)
(define output-port
(current-output-port))
@@ -89,12 +89,13 @@
(display output output-port))
(set! buffer (string-append buffer s))))
- ;; TODO, this is useful when re-running jobs, but I'm not sure that should
- ;; be a thing, jobs should probably be only attempted once.
- (exec-query
- conn
- "DELETE FROM load_new_guix_revision_job_log_parts WHERE job_id = $1"
- (list job-id))
+ (when delete-existing-log-parts?
+ ;; TODO, this is useful when re-running jobs, but I'm not sure that should
+ ;; be a thing, jobs should probably be only attempted once.
+ (exec-query
+ conn
+ "DELETE FROM load_new_guix_revision_job_log_parts WHERE job_id = $1"
+ (list job-id)))
(let ((port
(make-soft-port
@@ -1545,7 +1546,9 @@ SKIP LOCKED")
(simple-format #f "load-new-guix-revision ~A logging" id)
(lambda (logging-conn)
(insert-empty-log-entry logging-conn id)
- (let ((logging-port (log-port id logging-conn)))
+ (let ((logging-port
+ (log-port id logging-conn
+ #:delete-existing-log-parts? #t)))
(set-current-output-port logging-port)
(set-current-error-port logging-port)
(let ((result