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 diff --git a/backend/deps/guile-toolkit b/backend/deps/guile-toolkit index af9633e..23a0463 160000 --- a/backend/deps/guile-toolkit +++ b/backend/deps/guile-toolkit @@ -1 +1 @@ -Subproject commit af9633e10f630b61a4aee26ce8754e24f51af54b +Subproject commit 23a0463522af4155763e252d16114652d894da0d 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")