From aeb8ca7a742973e4bab821bce18c7e0457a11563 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Mon, 16 Mar 2020 12:38:20 -0700 Subject: [PATCH] cooperate with global logging envvar --- pollen/private/command.rkt | 39 +++++++++++++++++++++----------------- pollen/private/ts.rktd | 2 +- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/pollen/private/command.rkt b/pollen/private/command.rkt index c46a54f..fe23ed4 100644 --- a/pollen/private/command.rkt +++ b/pollen/private/command.rkt @@ -27,23 +27,28 @@ (very-nice-path (car args))))) (define (dispatch command-name) - (with-logging-to-port - (current-error-port) - (λ () - (case command-name - [("test" "xyzzy") (handle-test)] - [(#f "help") (handle-help)] - [("start") (handle-start)] ; parses its own args - ;; "second" arg is actually third in command line args, so use cddr not cdr - [("render") (handle-render)] ; render parses its own args from current-command-line-arguments - [("version") (handle-version)] - [("reset") (handle-reset (get-first-arg-or-current-dir))] - [("setup") (handle-setup)] - [("clone" "publish") (handle-publish)] - [else (handle-unknown command-name)])) - #:logger pollen-logger - 'info - 'pollen)) + (define dispatch-thunk + (λ () + (case command-name + [("test" "xyzzy") (handle-test)] + [(#f "help") (handle-help)] + [("start") (handle-start)] ; parses its own args + ;; "second" arg is actually third in command line args, so use cddr not cdr + [("render") (handle-render)] ; render parses its own args from current-command-line-arguments + [("version") (handle-version)] + [("reset") (handle-reset (get-first-arg-or-current-dir))] + [("setup") (handle-setup)] + [("clone" "publish") (handle-publish)] + [else (handle-unknown command-name)]))) + (cond + [(let ([str (getenv "PLTSTDERR")]) + (and str (regexp-match "@pollen" str))) (dispatch-thunk)] + [else (with-logging-to-port + (current-error-port) + dispatch-thunk + #:logger pollen-logger + 'info + 'pollen)])) (define (very-nice-path x) (path->complete-path (simplify-path (cleanse-path (->path x))))) diff --git a/pollen/private/ts.rktd b/pollen/private/ts.rktd index 0e8df39..1c49882 100644 --- a/pollen/private/ts.rktd +++ b/pollen/private/ts.rktd @@ -1 +1 @@ -1582754309 +1584387500