odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Use the currentThread function instead of current_thread 

bzr revid: stephane@openerp.com-20100906140645-zxt6los8sl54qzj0
This commit is contained in:
Stephane Wirtel 2010-09-06 16:06:45 +02:00
parent 56d507a7e1
commit 6b2e5f9896
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/netsvc.py
View File

@ -167,7 +167,7 @@ LEVEL_COLOR_MAPPING = {
class DBFormatter(logging.Formatter): class DBFormatter(logging.Formatter):
def format(self, record): def format(self, record):
record.dbname = getattr(threading.current_thread(), 'dbname', '?') record.dbname = getattr(threading.currentThread(), 'dbname', '?')
return logging.Formatter.format(self, record) return logging.Formatter.format(self, record)
class ColoredFormatter(DBFormatter): class ColoredFormatter(DBFormatter):

6
bin/sql_db.py
View File

@ -21,7 +21,7 @@
__all__ = ['db_connect', 'close_db'] __all__ = ['db_connect', 'close_db']
from threading import current_thread from threading import currentThread
import logging import logging
from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE
from psycopg2.psycopg1 import cursor as psycopg1cursor from psycopg2.psycopg1 import cursor as psycopg1cursor
@ -365,13 +365,13 @@ def dsn_are_equals(first, second):
_Pool = ConnectionPool(int(tools.config['db_maxconn'])) _Pool = ConnectionPool(int(tools.config['db_maxconn']))
def db_connect(db_name): def db_connect(db_name):
current_thread().dbname = db_name currentThread().dbname = db_name
return Connection(_Pool, db_name) return Connection(_Pool, db_name)
def close_db(db_name): def close_db(db_name):
_Pool.close_all(dsn(db_name)) _Pool.close_all(dsn(db_name))
tools.cache.clean_caches_for_db(db_name) tools.cache.clean_caches_for_db(db_name)
ct = current_thread() ct = currentThread()
if hasattr(ct, 'dbname'): if hasattr(ct, 'dbname'):
delattr(ct, 'dbname') delattr(ct, 'dbname')