From ed8cd4b37f5753cf13212acb93ca65b4c419cd60 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Thu, 20 Nov 2008 12:15:53 +0000 Subject: [PATCH] re-add the log file option svn: r12536 --- collects/handin-server/main.ss | 4 +--- collects/handin-server/web-status-server.ss | 23 ++++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/collects/handin-server/main.ss b/collects/handin-server/main.ss index ba1730692c..55291a7012 100644 --- a/collects/handin-server/main.ss +++ b/collects/handin-server/main.ss @@ -622,9 +622,7 @@ (log-line "server started ------------------------------") (hook 'server-start `([port ,(get-conf 'port-number)])) -(define stop-status - (cond [(get-conf 'https-port-number) => web:run] - [else void])) +(define stop-status (web:run)) (define session-count 0) diff --git a/collects/handin-server/web-status-server.ss b/collects/handin-server/web-status-server.ss index d6b37813a5..f6cc7090ce 100644 --- a/collects/handin-server/web-status-server.ss +++ b/collects/handin-server/web-status-server.ss @@ -266,15 +266,18 @@ handin-server/private/hooker handin-server/private/reloadable) #:manager (make-threshold-LRU-manager - (send-error "Your session has expired") (* 12 1024 1024)))) - - + (send-error "Your session has expired") (* 12 1024 1024)) + #:log-file (get-conf 'web-log-file))) (provide run) -(define (run p) - (define t - (thread (lambda () (dynamic-wind - (lambda () (log-line "*** starting web server")) - (run-servlet p) - (lambda () (log-line "*** web server died!")))))) - (lambda () (break-thread t))) +(define (run) + (cond [(get-conf 'https-port-number) + => (lambda (p) + (define t + (thread (lambda () + (dynamic-wind + (lambda () (log-line "*** starting web server")) + (run-servlet p) + (lambda () (log-line "*** web server died!")))))) + (lambda () (break-thread t)))] + [else void]))