From dfc9605cb61269138ccf196a54fb801160b32265 Mon Sep 17 00:00:00 2001 From: Cadence Ember Date: Thu, 9 Mar 2023 00:04:07 +1300 Subject: [PATCH] Also use anytime-path in log.rkt --- lib/syntax.rkt | 5 ++++- src/log.rkt | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lib/syntax.rkt b/lib/syntax.rkt index a587e03a..650e2f5e 100644 --- a/lib/syntax.rkt +++ b/lib/syntax.rkt @@ -136,7 +136,10 @@ (error 'anytime-path "syntax source has no directory: ~v" stx)) (datum->syntax stx - `(let* ([syntax-to-root (build-path (path-only ,source) ,to-root)] + `(let* ([source ,source] + [dir-of-source (path-only source)] + [_ (unless (path? dir-of-source) (error 'anytime-path "syntax source has no directory: ~v" ,source))] + [syntax-to-root (build-path dir-of-source ,to-root)] [root (if (directory-exists? syntax-to-root) ;; running on the same filesystem it was compiled on, i.e. it's running the source code out of a directory, and the complication is the intermediate compilation syntax-to-root diff --git a/src/log.rkt b/src/log.rkt index 5647986e..047c8aa0 100644 --- a/src/log.rkt +++ b/src/log.rkt @@ -1,7 +1,7 @@ #lang typed/racket/base (require racket/file + racket/path racket/port - racket/runtime-path racket/string typed/srfi/19 "config.rkt") @@ -14,12 +14,21 @@ (define last-flush 0) (define flush-every-millis 60000) -(define-runtime-path log-file "../storage/logs/access-0.log") +;; anytime-path macro expansion only works in an untyped submodule for reasons I cannot comprehend +(module define-log-dir racket/base + (require racket/path + "../lib/syntax.rkt") + (provide log-dir) + (define log-dir (anytime-path ".." "storage/logs"))) +(require/typed (submod "." define-log-dir) + [log-dir Path]) + +(define log-file (build-path log-dir "access-0.log")) (define log-port (if (config-true? 'access_log::enabled) (begin - (make-directory* (simplify-path (build-path log-file 'up))) - (open-output-file log-file #:exists 'append)) + (make-directory* log-dir) + (open-output-file log-file #:exists 'append)) (open-output-nowhere))) (: get-date-iso8601 (-> String))