From b8974f5d91be7d0e8d9623e7a0d0751f6f86a9c8 Mon Sep 17 00:00:00 2001
From: Brady McDonough <me@bradymcd.ca>
Date: Wed, 19 Feb 2025 15:19:56 -0700
Subject: [PATCH] Attempts to fix server logging

---
 backend/Makefile.in       |  2 +-
 backend/yacswa/routes.scm | 24 ++++++++++++++++--------
 backend/yacswa/yacswa.scm |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/backend/Makefile.in b/backend/Makefile.in
index 9b306fe..5d0da75 100644
--- a/backend/Makefile.in
+++ b/backend/Makefile.in
@@ -16,7 +16,7 @@ csv:
 up: .backend.lock
 
 .backend.lock: yacswa/yacswa.scm
-	@${ENV} @GUILE@ yacswa/yacswa.scm 2>&1 > yacswa-backend.log & PID=$$!; echo $${PID} > .backend.lock && echo "Server spawned with PID $${PID}" && echo "Allow for a couple minutes as data is fetched and initialized."
+	@${ENV} @GUILE@ yacswa/yacswa.scm &> server.log & PID=$$!; echo $${PID} > .backend.lock && echo "Server spawned with PID $${PID}" && echo "Allow for a couple minutes as data is fetched and initialized."
 
 down:
 	@PID=`cat .backend.lock` && kill -15 $${PID} && rm .backend.lock && echo "Server on PID $${PID} down."; unset PID
diff --git a/backend/yacswa/routes.scm b/backend/yacswa/routes.scm
index 85bb458..0dc89a0 100644
--- a/backend/yacswa/routes.scm
+++ b/backend/yacswa/routes.scm
@@ -5,7 +5,8 @@
   #:use-module (ice-9 regex)
   #:use-module (tk listlogic)
   #:use-module (tk short)
-  #:use-module (yacswa data))
+  #:use-module (yacswa data)
+  #:export (std-display))
 
 (use-modules (system repl server))
 
@@ -37,16 +38,23 @@
   (regexp-match? (string-match "^[0-9][0-9][0-9][0-9]$" code)))
 
 ;; Init
-(display "Spawning repl on port 1337...")
-(define repl-sock (make-tcp-server-socket #:port 1337))
-(display "done.\n")
 
+;; Artanis steals stdout/stderr
+(define std-display
+  (let ((stdout (current-output-port)))
+    (lambda (obj)
+      (display obj stdout))))
 
-(display "Calling init-server...\n")
+
+(std-display "Spawning repl...")
+(define repl-sock (make-tcp-server-socket))
+(std-display "done.\n")
+
+(std-display "Calling init-server...\n")
 (init-server #:statics '(png jpg jpeg ico html js css)
              #:cache-statics? #t #:exclude '())
-(display "Artanis initialized!\n")
-(display "Setting routes...")
+(std-display "Artanis initialized!\n")
+(std-display "Setting routes...")
 
 ;; Routes
 (get "/json/pc/:pc"
@@ -114,4 +122,4 @@
          ((#t) "Updated")
          ((#f) "Expecting"))))
 
-(display "done.\n")
+(std-display "done.\n")
diff --git a/backend/yacswa/yacswa.scm b/backend/yacswa/yacswa.scm
index f3e1abe..8c95b3c 100644
--- a/backend/yacswa/yacswa.scm
+++ b/backend/yacswa/yacswa.scm
@@ -10,5 +10,5 @@
 ;;(spawn-server repl-sock)
 
 ;; No SSL. Sad.
-(display "Bringing server up...\n")
+(std-display "Bringing server up...\n")
 (run #:port 1665)