From e3394a5cf5d4a86478f077d060313363e6b90023 Mon Sep 17 00:00:00 2001
From: Jay McCarthy <jay@racket-lang.org>
Date: Mon, 12 Feb 2007 14:43:53 +0000
Subject: [PATCH] welsh

svn: r5590
---
 .../web-server/dispatchers/dispatch-log.ss    | 65 ++++++++++---------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/collects/web-server/dispatchers/dispatch-log.ss b/collects/web-server/dispatchers/dispatch-log.ss
index 89e015ad14..d17a3e19ac 100644
--- a/collects/web-server/dispatchers/dispatch-log.ss
+++ b/collects/web-server/dispatchers/dispatch-log.ss
@@ -47,37 +47,40 @@
              log-ch
              (match-lambda
                [(list req)
-                (with-handlers ([exn? (lambda (e)
-                                        ((error-display-handler) "dispatch-log.ss: Error writing log entry" e)
-                                        (loop #f))])
-                  (define the-log-p
-                    (if (not (and log-p (file-exists? log-path)))
-                        (begin
-                          (unless (eq? log-p #f)
-                            (close-output-port log-p))
-                          (let ([new-log-p (open-output-file log-path 'append)])
-                            (file-stream-buffer-mode new-log-p 'line)
-                            new-log-p))
-                        log-p))
-                  (display
-                   (format "~s~n"
-                           (case log-format
-                             [(parenthesized-default)
-                              (list 'from (request-client-ip req)
-                                    'to (request-host-ip req)
-                                    'for (url->string (request-uri req)) 'at
-                                    (date->string (seconds->date (current-seconds)) #t))]
-                             [(extended)
-                              `((client-ip ,(request-client-ip req))
-                                (host-ip ,(request-host-ip req))
-                                (referer ,(let ([R (headers-assq* #"Referer" (request-headers/raw req))])
-                                            (if R
-                                                (header-value R)
-                                                #f)))                                              
-                                (uri ,(url->string (request-uri req)))
-                                (time ,(current-seconds)))]))
-                   the-log-p)
-                  (loop the-log-p))])))))))
+                (loop
+                 (with-handlers ([exn? (lambda (e)
+                                         ((error-display-handler) "dispatch-log.ss: Error writing log entry" e)
+                                         (with-handlers ([exn? (lambda (e) #f)])
+                                           (close-output-port log-p))
+                                         #f)])
+                   (define the-log-p
+                     (if (not (and log-p (file-exists? log-path)))
+                         (begin
+                           (unless (eq? log-p #f)
+                             (close-output-port log-p))
+                           (let ([new-log-p (open-output-file log-path 'append)])
+                             (file-stream-buffer-mode new-log-p 'line)
+                             new-log-p))
+                         log-p))
+                   (display
+                    (format "~s~n"
+                            (case log-format
+                              [(parenthesized-default)
+                               (list 'from (request-client-ip req)
+                                     'to (request-host-ip req)
+                                     'for (url->string (request-uri req)) 'at
+                                     (date->string (seconds->date (current-seconds)) #t))]
+                              [(extended)
+                               `((client-ip ,(request-client-ip req))
+                                 (host-ip ,(request-host-ip req))
+                                 (referer ,(let ([R (headers-assq* #"Referer" (request-headers/raw req))])
+                                             (if R
+                                                 (header-value R)
+                                                 #f)))                                              
+                                 (uri ,(url->string (request-uri req)))
+                                 (time ,(current-seconds)))]))
+                    the-log-p)
+                   the-log-p))])))))))
     (lambda args
       (thread-resume log-thread (current-custodian))
       (async-channel-put log-ch args)