From 56de6228116781fbf108c6a6f68cb3436d142c57 Mon Sep 17 00:00:00 2001
From: Siraaj Khandkar <siraaj@khandkar.net>
Date: Mon, 22 Mar 2021 13:08:16 -0400
Subject: [PATCH] Sync with logger before exit

---
 info.rkt |  2 +-
 tt.rkt   | 45 ++++++++++++++++++++++++++-------------------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/info.rkt b/info.rkt
index 1a5fe8b..f3bc687 100644
--- a/info.rkt
+++ b/info.rkt
@@ -6,7 +6,7 @@
 (define pkg-desc
   "twtxt client")
 (define version
-  "0.13.0")
+  "0.13.1")
 (define pkg-authors
   '("Siraaj Khandkar <siraaj@khandkar.net>"))
 (define deps
diff --git a/tt.rkt b/tt.rkt
index f290eec..8a09e4d 100644
--- a/tt.rkt
+++ b/tt.rkt
@@ -382,21 +382,29 @@
   (sort (append* (filter-map feed->msgs feeds))
         (λ (a b) (cmp (msg-ts-epoch a) (msg-ts-epoch b)))))
 
-(: start-logger (-> Log-Level Void))
-(define (start-logger level)
-  (let* ([logger       (make-logger #f #f level #f)]
-         [log-receiver (make-log-receiver logger level)])
-    (void (thread (λ ()
-                     (parameterize
-                       ([date-display-format 'iso-8601])
-                       (let loop ()
-                         (define data  (sync log-receiver))
-                         (define level (vector-ref data 0))
-                         (define msg   (vector-ref data 1))
-                         (define ts    (date->string (current-date) #t))
-                         (eprintf "~a [~a] ~a~n" ts level msg)
-                         (loop))))))
-    (current-logger logger)))
+(: log-writer-stop (-> Thread Void))
+(define (log-writer-stop log-writer)
+  (log-message (current-logger) 'fatal 'stop "Exiting." #f)
+  (thread-wait log-writer))
+
+(: logger-start (-> Log-Level Thread))
+(define (logger-start level)
+  (let* ([logger
+           (make-logger #f #f level #f)]
+         [log-receiver
+           (make-log-receiver logger level)]
+         [log-writer
+           (thread
+             (λ ()
+                (parameterize
+                  ([date-display-format 'iso-8601])
+                  (let loop ()
+                    (match-define (vector level msg _ topic) (sync log-receiver))
+                    (unless (equal? topic 'stop)
+                      (eprintf "~a [~a] ~a~n" (date->string (current-date) #t) level msg)
+                      (loop))))))])
+    (current-logger logger)
+    log-writer))
 
 (module+ main
   (let ([log-level 'info])
@@ -416,7 +424,7 @@
       "u, upload   : Upload your twtxt file (alias to execute ~/.tt/upload)."
       ""
       #:args (command . args)
-      (start-logger log-level)
+      (define log-writer (logger-start log-level))
       (current-command-line-arguments (list->vector args))
       (match command
         [(or "d" "download")
@@ -433,9 +441,8 @@
              #:args (filename)
              (define-values (_res _cpu real-ms _gc)
                (time-apply timeline-download (list num-workers (file->feeds filename))))
-             ; TODO Sync with logger before exit
-             (eprintf "Timeline downloaded in ~a seconds.~n" (/ real-ms 1000.0))
-             ))]
+             (log-info "Timeline downloaded in ~a seconds." (/ real-ms 1000.0))
+             (log-writer-stop log-writer)))]
         [(or "u" "upload")
          (command-line
            #:program
-- 
2.20.1