really solve the cycle, show config only when *re*loading

svn: r5489
This commit is contained in:
Eli Barzilay 2007-01-29 01:36:29 +00:00
parent aa685ff9c4
commit a742c67ab6

View File

@ -1,5 +1,5 @@
(module config mzscheme (module config mzscheme
(require (lib "file.ss") (lib "list.ss") "logger.ss") (require (lib "file.ss") (lib "list.ss"))
;; This module should be invoked when we're in the server directory ;; This module should be invoked when we're in the server directory
(provide server-dir) (provide server-dir)
@ -27,10 +27,11 @@
(error 'get-conf (error 'get-conf
"could not read conf (~a)" "could not read conf (~a)"
config-file))]) config-file))])
(when raw-config
;; can't use log-line from logger, since it makes a cycle ;; can't use log-line from logger, since it makes a cycle
(fprintf (current-error-port) (fprintf (current-error-port)
(format "(re)loading configuration from ~a" (format "loading configuration from ~a"
config-file)) config-file)))
(with-input-from-file config-file read))) (with-input-from-file config-file read)))
(set! config-cache (make-hash-table))))) (set! config-cache (make-hash-table)))))
(hash-table-get config-cache key (hash-table-get config-cache key