From 18a796a9811b57eaf6e46e675d02609ced0bcef1 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Mon, 29 May 2023 20:25:33 +0100
Subject: Make more logging output from the database module atomic

So that it's easier to read.
---
 nar-herder/database.scm | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

(limited to 'nar-herder/database.scm')

diff --git a/nar-herder/database.scm b/nar-herder/database.scm
index 1bf03d0..945d1f6 100644
--- a/nar-herder/database.scm
+++ b/nar-herder/database.scm
@@ -270,18 +270,22 @@ CREATE INDEX cached_narinfo_files_narinfo_id
                            (lambda (seconds-delayed)
                              (metric-observe delay-metric seconds-delayed)
                              (when (> seconds-delayed 1)
-                               (format
-                                (current-error-port)
-                                "warning: database read delayed by ~1,2f seconds~%"
-                                seconds-delayed))))
+                               (display
+                                (format
+                                 #f
+                                 "warning: database read delayed by ~1,2f seconds~%"
+                                 seconds-delayed)
+                                (current-error-port)))))
           #:duration-logger
           (lambda (duration proc)
             (when (> duration 5)
-              (format
-               (current-error-port)
-               "warning: database read took ~1,2f seconds (~a)~%"
-               duration
-               proc)))))
+              (display
+               (format
+                #f
+                "warning: database read took ~1,2f seconds (~a)~%"
+                duration
+                proc)
+               (current-error-port))))))
 
         (writer-thread-channel
          (make-worker-thread-set
@@ -312,18 +316,22 @@ CREATE INDEX cached_narinfo_files_narinfo_id
                            (lambda (seconds-delayed)
                              (metric-observe delay-metric seconds-delayed)
                              (when (> seconds-delayed 1)
-                               (format
-                                (current-error-port)
-                                "warning: database write delayed by ~1,2f seconds~%"
-                                seconds-delayed))))
+                               (display
+                                (format
+                                 #f
+                                 "warning: database write delayed by ~1,2f seconds~%"
+                                 seconds-delayed)
+                                (current-error-port)))))
           #:duration-logger
           (lambda (duration proc)
             (when (> duration 5)
-              (format
-               (current-error-port)
-               "warning: database write took ~1,2f seconds (~a)~%"
-               duration
-               proc))))))
+              (display
+               (format
+                #f
+                "warning: database write took ~1,2f seconds (~a)~%"
+                duration
+                proc)
+               (current-error-port)))))))
 
     (make-database database-file
                    reader-thread-channel
-- 
cgit v1.2.3