From bf469504eb4df95a3349328dc10095d172630fcd Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Sat, 31 Aug 2019 12:10:54 +0100
Subject: Add buffering to the log handling for jobs

To increase the log output speed, avoiding inserting one character at a time
in to the database.
---
 guix-data-service/jobs/load-new-guix-revision.scm | 38 ++++++++++++++---------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index 393ef06..8b1ea84 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -40,6 +40,7 @@
     (current-output-port))
 
   (define id 0)
+  (define buffer "")
 
   (define (insert job_id s)
     (exec-query
@@ -50,9 +51,13 @@
      (list (number->string id) job_id s)))
 
   (define (log-string s)
-    (set! id (+ 1 id)) ; increment id
-    (insert job-id s)
-    (display s output-port))
+    (if (string-contains s "\n")
+        (let ((output (string-append buffer s)))
+          (set! id (+ 1 id)) ; increment id
+          (set! buffer "") ; clear the buffer
+          (insert job-id output)
+          (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.
@@ -61,18 +66,21 @@
    "DELETE FROM load_new_guix_revision_job_log_parts WHERE job_id = $1"
    (list job-id))
 
-  (make-soft-port
-   (vector (lambda (c)
-             (log-string (string c)))
-           log-string
-           (lambda ()
-             (force-output output-port))
-           #f ; fetch one character
-           (lambda ()
-             ;; close port
-             #f)
-           #f) ; number of characters that can be read
-   "w"))
+  (let ((port
+         (make-soft-port
+          (vector (lambda (c)
+                    (set! buffer (string-append buffer (string c))))
+                  log-string
+                  (lambda ()
+                    (force-output output-port))
+                  #f ; fetch one character
+                  (lambda ()
+                    ;; close port
+                    #f)
+                  #f) ; number of characters that can be read
+          "w")))
+    (setvbuf port 'line)
+    port))
 
 (define* (log-for-job conn job-id
                       #:key
-- 
cgit v1.2.3