From a097521f38dec625aaf39bb98e482e26cb7d88f3 Mon Sep 17 00:00:00 2001
From: Vincent St-Amour <stamourv@racket-lang.org>
Date: Wed, 22 Jul 2015 16:25:32 -0500
Subject: [PATCH] Move part of of unstable/logging to racket/logging.

---
 .../typed-racket/optimizer/logging.rkt        |  2 +-
 typed-racket-lib/unstable/logging.rkt         | 44 +++----------------
 2 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/typed-racket-lib/typed-racket/optimizer/logging.rkt b/typed-racket-lib/typed-racket/optimizer/logging.rkt
index ecf2cc63..122b5c69 100644
--- a/typed-racket-lib/typed-racket/optimizer/logging.rkt
+++ b/typed-racket-lib/typed-racket/optimizer/logging.rkt
@@ -1,7 +1,7 @@
 #lang racket/base
 
 (require racket/string
-         unstable/syntax unstable/logging syntax/parse
+         unstable/syntax racket/logging syntax/parse
          data/queue
          "../utils/tc-utils.rkt")
 
diff --git a/typed-racket-lib/unstable/logging.rkt b/typed-racket-lib/unstable/logging.rkt
index f8419aa1..81af28df 100644
--- a/typed-racket-lib/unstable/logging.rkt
+++ b/typed-racket-lib/unstable/logging.rkt
@@ -1,10 +1,11 @@
 #lang racket/base
 
-(require racket/contract/base)
+(require racket/contract/base
+         racket/logging)
 
-(define level/c (or/c 'fatal 'error 'warning 'info 'debug))
-(define log-spec/c (listof (or/c symbol? #f)))
-(define log-message/c (vector/c level/c string? any/c (or/c symbol? #f)))
+;; re-exported from racket/logging, for backwards compatibility
+(provide with-intercepted-logging
+         with-logging-to-port)
 
 ;; helper used below
 (define (receiver-thread receiver stop-chan intercept)
@@ -57,38 +58,5 @@
   (reverse (listener-rev-messages cur-listener)))
 
 (provide/contract
- [start-recording (->* () #:rest log-spec/c listener?)]
+ [start-recording (->* () #:rest (listof (or/c symbol? #f)) listener?)]
  [stop-recording  (-> listener? (listof log-message/c))])
-
-
-(define (with-intercepted-logging interceptor proc . log-spec)
-  (let* ([orig-logger (current-logger)]
-         ;; We use a local logger to avoid getting messages that didn't
-         ;; originate from proc. Since it's a child of the original logger,
-         ;; the rest of the program still sees the log entries.
-         [logger      (make-logger #f orig-logger)]
-         [receiver    (apply make-log-receiver logger log-spec)]
-         [stop-chan   (make-channel)]
-         [t           (receiver-thread receiver stop-chan interceptor)])
-    (begin0
-        (parameterize ([current-logger logger])
-          (proc))
-      (channel-put stop-chan 'stop) ; stop the receiver thread
-      (thread-wait t))))
-
-(define (with-logging-to-port port proc . log-spec)
-  (apply with-intercepted-logging
-         (lambda (l) (displayln (vector-ref l 1) ; actual message
-                                port))
-         proc
-         log-spec))
-
-(provide/contract [with-intercepted-logging
-                   (->* ((-> log-message/c any)
-                         (-> any))
-                        #:rest log-spec/c
-                        any)]
-                  [with-logging-to-port
-                   (->* (output-port? (-> any))
-                        #:rest log-spec/c
-                        any)])