-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-# $Id$
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# GNU Affero General Public License for more details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
__all__ = ['db_connect', 'close_db']
-import netsvc
+import logging
from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE
from psycopg2.psycopg1 import cursor as psycopg1cursor
from psycopg2.pool import PoolError
re_from = re.compile('.* from "?([a-zA-Z_0-9]+)"? .*$');
re_into = re.compile('.* into "?([a-zA-Z_0-9]+)"? .*$');
-
-def log(msg, lvl=netsvc.LOG_DEBUG):
- logger = netsvc.Logger()
- logger.notifyChannel('sql', lvl, msg)
+sql_counter = 0
class Cursor(object):
IN_MAX = 1000
+ __logger = logging.getLogger('db.cursor')
def check(f):
@wraps(f)
def wrapper(self, *args, **kwargs):
if self.__closed:
- raise psycopg2.ProgrammingError('Unable to use the cursor after having closing it')
+ raise psycopg2.ProgrammingError('Unable to use the cursor after having closed it')
return f(self, *args, **kwargs)
return wrapper
self.sql_into_log = {}
self.sql_log = False
self.sql_log_count = 0
-
self.__closed = True # avoid the call of close() (by __del__) if an exception
# is raised by any of the following initialisations
self._pool = pool
# pool, preventing some operation on the database like dropping it.
# This can also lead to a server overload.
msg = "Cursor not closed explicitly\n" \
- "Cursor was created at %s:%s" % self.__caller
- log(msg, netsvc.LOG_WARNING)
+ "Cursor was created at %s:%s"
+ self.__logger.warn(msg, *self.__caller)
self.close()
@check
def execute(self, query, params=None):
if '%d' in query or '%f' in query:
- log(query, netsvc.LOG_WARNING)
- log("SQL queries mustn't contain %d or %f anymore. Use only %s", netsvc.LOG_WARNING)
+ self.__logger.warn(query)
+ self.__logger.warn("SQL queries cannot contain %d or %f anymore. "
+ "Use only %s")
if params:
query = query.replace('%d', '%s').replace('%f', '%s')
try:
params = params or None
res = self._obj.execute(query, params)
- except Exception, e:
- log("bad query: %s" % self._obj.query)
- log(e)
+ except psycopg2.ProgrammingError, pe:
+ self.__logger.error("Programming error: %s, in query %s" % (pe, query))
+ raise
+ except Exception:
+ self.__logger.exception("bad query: %s", self._obj.query)
raise
if self.sql_log:
delay = mdt.now() - now
delay = delay.seconds * 1E6 + delay.microseconds
- log("query: %s" % self._obj.query)
+ self.__logger.debug("query: %s", self._obj.query)
self.sql_log_count+=1
res_from = re_from.match(query.lower())
if res_from:
return res
def print_log(self):
+ global sql_counter
+ sql_counter += self.sql_log_count
if not self.sql_log:
return
-
def process(type):
sqllogs = {'from':self.sql_from_log, 'into':self.sql_into_log}
- if not sqllogs[type]:
- return
- sqllogitems = sqllogs[type].items()
- sqllogitems.sort(key=lambda k: k[1][1])
sum = 0
- log("SQL LOG %s:" % (type,))
- for r in sqllogitems:
- delay = timedelta(microseconds=r[1][1])
- log("table: %s: %s/%s" %(r[0], str(delay), r[1][0]))
- sum+= r[1][1]
+ if sqllogs[type]:
+ sqllogitems = sqllogs[type].items()
+ sqllogitems.sort(key=lambda k: k[1][1])
+ self.__logger.debug("SQL LOG %s:", type)
+ for r in sqllogitems:
+ delay = timedelta(microseconds=r[1][1])
+ self.__logger.debug("table: %s: %s/%s",
+ r[0], delay, r[1][0])
+ sum+= r[1][1]
+ sqllogs[type].clear()
sum = timedelta(microseconds=sum)
- log("SUM:%s/%d" % (str(sum), self.sql_log_count))
+ self.__logger.debug("SUM %s:%s/%d [%d]",
+ type, sum, self.sql_log_count, sql_counter)
sqllogs[type].clear()
process('from')
process('into')
class ConnectionPool(object):
+ __logger = logging.getLogger('db.connection_pool')
+
def locked(fun):
@wraps(fun)
def _locked(self, *args, **kwargs):
self._connections = []
self._maxconn = max(maxconn, 1)
self._lock = threading.Lock()
- self._logger = netsvc.Logger()
def __repr__(self):
used = len([1 for c, u in self._connections[:] if u])
return "ConnectionPool(used=%d/count=%d/max=%d)" % (used, count, self._maxconn)
def _debug(self, msg):
- self._logger.notifyChannel('ConnectionPool', netsvc.LOG_DEBUG, repr(self))
- self._logger.notifyChannel('ConnectionPool', netsvc.LOG_DEBUG, msg)
+ self.__logger.debug(repr(self))
+ self.__logger.debug(msg)
@locked
def borrow(self, dsn):
class Connection(object):
- def _debug(self, msg):
- self._logger.notifyChannel('Connection', netsvc.LOG_DEBUG, msg)
+ __logger = logging.getLogger('db.connection')
def __init__(self, pool, dbname):
self.dbname = dbname
self._pool = pool
- self._logger = netsvc.Logger()
def cursor(self, serialized=False):
cursor_type = serialized and 'serialized ' or ''
- self._debug('create %scursor to "%s"' % (cursor_type, self.dbname,))
+ self.__logger.debug('create %scursor to "%s"' % (cursor_type, self.dbname,))
return Cursor(self._pool, self.dbname, serialized=serialized)
def serialized_cursor(self):
projects / odoo / odoo.git / blobdiff