Revert "don't use #:logger argument"

This reverts commit 42bccf3e50.
candidate-v2.0
Matthew Butterick 5 years ago
parent 42bccf3e50
commit 4bf80ef26d

@ -27,23 +27,23 @@
(very-nice-path (car args))))) (very-nice-path (car args)))))
(define (dispatch command-name) (define (dispatch command-name)
(parameterize ([current-logger pollen-logger]) (with-logging-to-port
(with-logging-to-port (current-error-port)
(current-error-port) (λ ()
(λ () (case command-name
(case command-name [("test" "xyzzy") (handle-test)]
[("test" "xyzzy") (handle-test)] [(#f "help") (handle-help)]
[(#f "help") (handle-help)] [("start") (handle-start)] ; parses its own args
[("start") (handle-start)] ; parses its own args ;; "second" arg is actually third in command line args, so use cddr not cdr
;; "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
[("render") (handle-render)] ; render parses its own args from current-command-line-arguments [("version") (handle-version)]
[("version") (handle-version)] [("reset") (handle-reset (get-first-arg-or-current-dir))]
[("reset") (handle-reset (get-first-arg-or-current-dir))] [("setup") (handle-setup (get-first-arg-or-current-dir))]
[("setup") (handle-setup (get-first-arg-or-current-dir))] [("clone" "publish") (handle-publish)]
[("clone" "publish") (handle-publish)] [else (handle-unknown command-name)]))
[else (handle-unknown command-name)])) #:logger pollen-logger
'info 'info
'pollen))) 'pollen))
(define (very-nice-path x) (define (very-nice-path x)
(path->complete-path (simplify-path (cleanse-path (->path x))))) (path->complete-path (simplify-path (cleanse-path (->path x)))))
@ -177,7 +177,7 @@ version print the version" (current-server-port) (make-publish-di
(and (>= (length xs) (length prefix)) (and (>= (length xs) (length prefix))
(andmap equal? prefix (for/list ([(x idx) (in-indexed xs)] (andmap equal? prefix (for/list ([(x idx) (in-indexed xs)]
#:break (= idx (length prefix))) #:break (= idx (length prefix)))
x)))) x))))
((explode-path possible-subdir) . has-prefix? . (explode-path possible-superdir))) ((explode-path possible-subdir) . has-prefix? . (explode-path possible-superdir)))
(define (handle-publish) (define (handle-publish)

Loading…
Cancel
Save