more v4-isms
svn: r11683
This commit is contained in:
parent
78632e178d
commit
0c0630d50d
|
@ -1,5 +1,6 @@
|
||||||
(module config mzscheme
|
#lang scheme/base
|
||||||
(require mzlib/file mzlib/list)
|
|
||||||
|
(require scheme/file)
|
||||||
|
|
||||||
;; 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)
|
||||||
|
@ -33,8 +34,8 @@
|
||||||
(format "loading configuration from ~a\n"
|
(format "loading configuration from ~a\n"
|
||||||
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-hasheq)))))
|
||||||
(hash-table-get config-cache key
|
(hash-ref config-cache key
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(let*-values ([(default translate) (config-default+translate key)]
|
(let*-values ([(default translate) (config-default+translate key)]
|
||||||
;; translate = #f => this is a computed value
|
;; translate = #f => this is a computed value
|
||||||
|
@ -42,7 +43,7 @@
|
||||||
(translate (cond [(assq key raw-config) => cadr]
|
(translate (cond [(assq key raw-config) => cadr]
|
||||||
[else default]))
|
[else default]))
|
||||||
default)])
|
default)])
|
||||||
(hash-table-put! config-cache key v)
|
(hash-set! config-cache key v)
|
||||||
v))))
|
v))))
|
||||||
|
|
||||||
(define (id x) x)
|
(define (id x) x)
|
||||||
|
@ -107,5 +108,3 @@
|
||||||
(define (assignment<->dir a/d)
|
(define (assignment<->dir a/d)
|
||||||
(cond [(assoc a/d (get-conf 'names-dirs)) => cadr]
|
(cond [(assoc a/d (get-conf 'names-dirs)) => cadr]
|
||||||
[else (error 'assignment<->dir "internal error: ~e" a/d)]))
|
[else (error 'assignment<->dir "internal error: ~e" a/d)]))
|
||||||
|
|
||||||
)
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
(module logger mzscheme
|
#lang scheme/base
|
||||||
(require "config.ss" mzlib/date mzlib/port)
|
|
||||||
|
(require "config.ss" scheme/date scheme/port)
|
||||||
|
|
||||||
(provide current-session)
|
(provide current-session)
|
||||||
(define current-session (make-parameter #f))
|
(define current-session (make-parameter #f))
|
||||||
|
@ -74,4 +75,4 @@
|
||||||
(make-logger-port
|
(make-logger-port
|
||||||
(and (get-conf 'log-output) (current-output-port))
|
(and (get-conf 'log-output) (current-output-port))
|
||||||
(cond [(get-conf 'log-file) => (lambda (f) (open-output-file f 'append))]
|
(cond [(get-conf 'log-file) => (lambda (f) (open-output-file f 'append))]
|
||||||
[else #f])))))
|
[else #f]))))
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
(module md5 mzscheme
|
#lang scheme/base
|
||||||
(require (prefix mz: mzlib/md5))
|
(require (prefix-in mz: file/md5))
|
||||||
(define (md5 s)
|
(define (md5 s)
|
||||||
(bytes->string/latin-1 (mz:md5 (string->bytes/utf-8 s))))
|
(bytes->string/latin-1 (mz:md5 (string->bytes/utf-8 s))))
|
||||||
(provide md5))
|
(provide md5)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user