Merge pull request #17 from mosquito/master

logging with logging

Author: methane

tornado_mysql/pools.py

@@ -3,6 +3,7 @@
 
 from collections import deque
 import warnings
+import logging
 
 from tornado.ioloop import IOLoop
 from tornado.gen import coroutine, Return
@@ -12,12 +13,7 @@
 from tornado_mysql.connections import Connection
 
 
-DEBUG = False
-
-
-def _debug(*msg):
-    if DEBUG:
-        print(*msg)
+log = logging.getLogger("tornado_mysql.pools")
 
 
 class Pool(object):
@@ -67,15 +63,15 @@ def _get_conn(self):
             if now - conn.connected_time > self.max_recycle_sec:
                 self._close_async(conn)
                 continue
-            _debug("Reusing connection from pool:", self.stat())
+            log.debug("Reusing connection from pool: %s", self.stat())
             fut = Future()
             fut.set_result(conn)
             return fut
 
         # Open new connection
         if self.max_open == 0 or self._opened_conns < self.max_open:
             self._opened_conns += 1
-            _debug("Creating new connection:", self.stat())
+            log.debug("Creating new connection: %s", self.stat())
             return connect(**self.connect_kwargs)
 
         # Wait to other connection is released.
@@ -89,10 +85,10 @@ def _put_conn(self, conn):
             if self._waitings:
                 fut = self._waitings.popleft()
                 fut.set_result(conn)
-                _debug("Passing returned connection to waiter:", self.stat())
+                log.debug("Passing returned connection to waiter: %s", self.stat())
             else:
                 self._free_conn.append(conn)
-                _debug("Add conn to free pool:", self.stat())
+                log.debug("Add conn to free pool: %s", self.stat())
         else:
             self._close_async(conn)
 
@@ -111,7 +107,7 @@ def _after_close(self, fut=None):
             self.io_loop.add_future(cf, callback=lambda f: fut.set_result(conn))
         else:
             self._opened_conns -= 1
-        _debug("Connection closed:", self.stat())
+        log.debug("Connection closed: %s", self.stat())
 
     @coroutine
     def execute(self, query, params=None):
@@ -194,4 +190,5 @@ def rollback(self):
     def __del__(self):
         if self._pool is not None:
             warnings.warn("Transaction has not committed or rollbacked.")
+            log.warn("Transaction has not committed or rollbacked.")
             self._pool._close_conn(self._conn)