# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+# Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# GNU Affero General Public License for more details.
#
# 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/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
__all__ = ['db_connect', 'close_db']
+from threading import currentThread
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
import psycopg2.extensions
+import warnings
psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
import tools
-from tools.func import wraps
+from tools.func import wraps, frame_codeinfo
+from netsvc import Agent
from datetime import datetime as mdt
from datetime import timedelta
import threading
-from inspect import stack
+from inspect import currentframe
import re
re_from = re.compile('.* from "?([a-zA-Z_0-9]+)"? .*$');
@wraps(f)
def wrapper(self, *args, **kwargs):
if self.__closed:
- raise psycopg2.ProgrammingError('Unable to use the cursor after having closed it')
+ raise psycopg2.OperationalError('Unable to use the cursor after having closed it')
return f(self, *args, **kwargs)
return wrapper
self._obj = self._cnx.cursor(cursor_factory=psycopg1cursor)
self.__closed = False # real initialisation value
self.autocommit(False)
- self.__caller = tuple(stack()[2][1:3])
+ if self.sql_log:
+ self.__caller = frame_codeinfo(currentframe(),2)
+ else:
+ self.__caller = False
def __del__(self):
if not self.__closed:
# but the database connection is not put back into the connection
# 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.__logger.warn(msg, *self.__caller)
+ msg = "Cursor not closed explicitly\n"
+ if self.__caller:
+ msg += "Cursor was created at %s:%s" % self.__caller
+ else:
+ msg += "Please enable sql debugging to trace the caller."
+ self.__logger.warn(msg)
self._close(True)
@check
- def execute(self, query, params=None):
+ def execute(self, query, params=None, log_exceptions=True):
if '%d' in query or '%f' in query:
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')
if self.sql_log:
now = mdt.now()
params = params or None
res = self._obj.execute(query, params)
except psycopg2.ProgrammingError, pe:
- self.__logger.error("Programming error: %s, in query %s", pe, query)
+ if log_exceptions:
+ self.__logger.error("Programming error: %s, in query %s", pe, query)
raise
except Exception:
- self.__logger.exception("bad query: %s", self._obj.query)
+ if log_exceptions:
+ self.__logger.exception("bad query: %s", self._obj.query or query)
raise
if self.sql_log:
sqllogitems = sqllogs[type].items()
sqllogitems.sort(key=lambda k: k[1][1])
self.__logger.log(logging.DEBUG_SQL, "SQL LOG %s:", type)
+ sqllogitems.sort(lambda x,y: cmp(x[1][0], y[1][0]))
for r in sqllogitems:
delay = timedelta(microseconds=r[1][1])
self.__logger.log(logging.DEBUG_SQL, "table: %s: %s/%s",
delattr(cnx, 'leaked')
self._connections.pop(i)
self._connections.append((cnx, False))
- self._debug('Free leaked connection to %r', cnx.dsn)
+ self.__logger.warn('%r: Free leaked connection to %r', self, cnx.dsn)
for i, (cnx, used) in enumerate(self._connections):
if not used and dsn_are_equals(cnx.dsn, dsn):
# note: this code is called only if the for loop has completed (no break)
raise PoolError('The Connection Pool Is Full')
- result = psycopg2.connect(dsn=dsn, connection_factory=PsycoConnection)
+ try:
+ result = psycopg2.connect(dsn=dsn, connection_factory=PsycoConnection)
+ except psycopg2.Error, e:
+ self.__logger.exception('Connection to the database failed')
+ raise
self._connections.append((result, True))
self._debug('Create new connection')
return result
@locked
def close_all(self, dsn):
- self._debug('Close all connections to %r', dsn)
+ self.__logger.info('%r: Close all connections to %r', self, dsn)
for i, (cnx, used) in tools.reverse_enumerate(self._connections):
if dsn_are_equals(cnx.dsn, dsn):
cnx.close()
def __nonzero__(self):
"""Check if connection is possible"""
try:
+ warnings.warn("You use an expensive function to test a connection.",
+ DeprecationWarning, stacklevel=1)
cr = self.cursor()
cr.close()
return True
- except:
+ except Exception:
return False
_Pool = ConnectionPool(int(tools.config['db_maxconn']))
def db_connect(db_name):
+ currentThread().dbname = db_name
return Connection(_Pool, db_name)
def close_db(db_name):
_Pool.close_all(dsn(db_name))
+ Agent.cancel(db_name)
tools.cache.clean_caches_for_db(db_name)
+ ct = currentThread()
+ if hasattr(ct, 'dbname'):
+ delattr(ct, 'dbname')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
projects / odoo / odoo.git / blobdiff