From ce567c861edeb4bef425d5d7f93285cc65a58d88 Mon Sep 17 00:00:00 2001
From: Ryan Culpepper <ryanc@racket-lang.org>
Date: Tue, 4 Dec 2012 21:34:53 -0500
Subject: [PATCH] use define-logger

---
 collects/db/private/generic/connect-util.rkt | 22 ++++++++++----------
 collects/db/private/generic/interfaces.rkt   | 11 +++++-----
 collects/db/private/sqlite3/connection.rkt   |  7 ++++---
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/collects/db/private/generic/connect-util.rkt b/collects/db/private/generic/connect-util.rkt
index c7cf3337ff..6b5390424c 100644
--- a/collects/db/private/generic/connect-util.rkt
+++ b/collects/db/private/generic/connect-util.rkt
@@ -141,7 +141,7 @@
                  (handle-evt (apply choice-evt keys)
                              ;; Assignment to key has expired
                              (lambda (key)
-                               (dbdebug "virtual-connection: key expiration: ~e" key)
+                               (log-db-debug "virtual-connection: key expiration: ~e" key)
                                (remove! key)))))))))
 
     ;; == methods called in client thread ==
@@ -253,21 +253,21 @@
                     [else (new-connection)])]
              [proxy-number (begin0 proxy-counter (set! proxy-counter (add1 proxy-counter)))]
              [c (new proxy-connection% (pool this) (connection raw-c) (number proxy-number))])
-        (dbdebug "connection-pool: leasing connection #~a (~a @~a)"
-                 proxy-number
-                 (if take-idle? "idle" "new")
-                 (hash-ref actual=>number raw-c "???"))
+        (log-db-debug "connection-pool: leasing connection #~a (~a @~a)"
+                      proxy-number
+                      (if take-idle? "idle" "new")
+                      (hash-ref actual=>number raw-c "???"))
         (hash-set! proxy=>evt c (wrap-evt key (lambda (_e) c)))
         (set! assigned-connections (add1 assigned-connections))
         c))
 
     (define/private (release* proxy raw-c why)
-      (dbdebug "connection-pool: releasing connection #~a (~a, ~a)"
-               (send proxy get-number)
-               (cond [(not raw-c) "no-op"]
-                     [(< (length idle-list) max-idle-connections) "idle"]
-                     [else "disconnect"])
-               why)
+      (log-db-debug "connection-pool: releasing connection #~a (~a, ~a)"
+                    (send proxy get-number)
+                    (cond [(not raw-c) "no-op"]
+                          [(< (length idle-list) max-idle-connections) "idle"]
+                          [else "disconnect"])
+                    why)
       (hash-remove! proxy=>evt proxy)
       (when raw-c
         (with-handlers ([exn:fail? void])
diff --git a/collects/db/private/generic/interfaces.rkt b/collects/db/private/generic/interfaces.rkt
index 6426ecb8ab..38f715087b 100644
--- a/collects/db/private/generic/interfaces.rkt
+++ b/collects/db/private/generic/interfaces.rkt
@@ -18,8 +18,10 @@
 
          init-private
 
-         dblogger
-         dbdebug
+         log-db-error
+         log-db-warning
+         log-db-info
+         log-db-debug
 
          (struct-out exn:fail:sql)
          raise-sql-error)
@@ -144,10 +146,7 @@
 
 ;; Logging
 
-(define dblogger (make-logger 'db (current-logger)))
-
-(define (dbdebug fmt . args)
-  (log-message dblogger 'debug (apply format fmt args) #f))
+(define-logger db)
 
 ;; ----------------------------------------
 
diff --git a/collects/db/private/sqlite3/connection.rkt b/collects/db/private/sqlite3/connection.rkt
index 31263c2e1f..09e12a6ce2 100644
--- a/collects/db/private/sqlite3/connection.rkt
+++ b/collects/db/private/sqlite3/connection.rkt
@@ -318,9 +318,10 @@
                  (handle* who thunk (add1 iteration))]
                 [else
                  (when (> iteration 0)
-                   (dbdebug "continuing with ~s after SQLITE_BUSY x ~s"
-                            (if (= s SQLITE_BUSY) "SQLITE_BUSY" s)
-                            iteration))
+                   (log-db-debug "continuing ~s with ~s after SQLITE_BUSY x ~s"
+                                 who
+                                 (if (= s SQLITE_BUSY) "SQLITE_BUSY" s)
+                                 iteration))
                  (apply values (handle-status who s) rest)]))))
 
     ;; Some errors can cause whole transaction to rollback;