From c78f44fc03fd0bf0a434cd9afe911b8b3b112b33 Mon Sep 17 00:00:00 2001 From: Brady McDonough Date: Sun, 23 Feb 2025 03:01:07 +0000 Subject: [PATCH 1/4] Fixes upstream --- backend/deps/guile-toolkit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/deps/guile-toolkit b/backend/deps/guile-toolkit index af9633e..ed747fb 160000 --- a/backend/deps/guile-toolkit +++ b/backend/deps/guile-toolkit @@ -1 +1 @@ -Subproject commit af9633e10f630b61a4aee26ce8754e24f51af54b +Subproject commit ed747fb00d872e92207c65bc7d3d3fbde60875c4 From fb923455c26dd83477a0e62fdad64d9b34efb48a Mon Sep 17 00:00:00 2001 From: Brady McDonough Date: Tue, 25 Feb 2025 01:43:58 +0000 Subject: [PATCH 2/4] Upstream fixes --- backend/deps/guile-toolkit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/deps/guile-toolkit b/backend/deps/guile-toolkit index ed747fb..23a0463 160000 --- a/backend/deps/guile-toolkit +++ b/backend/deps/guile-toolkit @@ -1 +1 @@ -Subproject commit ed747fb00d872e92207c65bc7d3d3fbde60875c4 +Subproject commit 23a0463522af4155763e252d16114652d894da0d From baf4eb111267d519a669b0763a4a8aec9a3e34b8 Mon Sep 17 00:00:00 2001 From: Brady McDonough Date: Tue, 25 Feb 2025 01:56:35 +0000 Subject: [PATCH 3/4] Major breaking change in Artanis around rc1.2.0 identified and solved for now --- backend/yacswa/routes.scm | 13 +++---------- backend/yacswa/yacswa.scm | 4 +++- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/backend/yacswa/routes.scm b/backend/yacswa/routes.scm index 0dc89a0..7ca40d7 100644 --- a/backend/yacswa/routes.scm +++ b/backend/yacswa/routes.scm @@ -8,8 +8,6 @@ #:use-module (yacswa data) #:export (std-display)) -(use-modules (system repl server)) - ;;TODO: Better verify functions ;; : figure out the #:mtime directive for (response-emit) ;; : Change the API around to separate expiry tagging @@ -45,16 +43,11 @@ (lambda (obj) (display obj stdout)))) - -(std-display "Spawning repl...") -(define repl-sock (make-tcp-server-socket)) -(std-display "done.\n") - -(std-display "Calling init-server...\n") +(display "Calling init-server...\n") (init-server #:statics '(png jpg jpeg ico html js css) #:cache-statics? #t #:exclude '()) -(std-display "Artanis initialized!\n") -(std-display "Setting routes...") +(display "Artanis initialized!\n") +(display "Setting routes...") ;; Routes (get "/json/pc/:pc" diff --git a/backend/yacswa/yacswa.scm b/backend/yacswa/yacswa.scm index 8c95b3c..15638dd 100644 --- a/backend/yacswa/yacswa.scm +++ b/backend/yacswa/yacswa.scm @@ -6,8 +6,10 @@ #:use-module (yacswa routes)) -;;(define repl-sock (make-unix-domain-server-socket #:path "./bc")) +;;(display "Spawning REPL...") +;;(define repl-sock (make-tcp-server-socket)) ;;(spawn-server repl-sock) +;;(display "done.\n") ;; No SSL. Sad. (std-display "Bringing server up...\n") From a614e9e45357b3182ca6c38ebc9a82aacf7b1e5b Mon Sep 17 00:00:00 2001 From: Brady McDonough Date: Tue, 25 Feb 2025 01:57:22 +0000 Subject: [PATCH 4/4] stdout redirect still not working for backend --- backend/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/Makefile.in b/backend/Makefile.in index 5d0da75..45c2b44 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 &> 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." + @${ENV} @GUILE@ yacswa/yacswa.scm > server.log 2>&1 & 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