[REF] pooler: mark the functions as deprecated.
bzr revid: vmt@openerp.com-20130327141653-p7re4tknkwe1pc80
This commit is contained in:
parent
1e7e2ca753
commit
314a8dab70
|
@ -35,4 +35,9 @@ by the user to check if her code is future proof.
|
||||||
# Change to False around 2013.02.
|
# Change to False around 2013.02.
|
||||||
open_openerp_namespace = False
|
open_openerp_namespace = False
|
||||||
|
|
||||||
|
# If True, the functions in openerp.pooler can be used.
|
||||||
|
# Introduced around 2013.03 (actually they are deprecated since much longer
|
||||||
|
# but no warning was dispayed in the logs).
|
||||||
|
openerp_pooler = True
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
|
@ -25,27 +25,36 @@
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
import logging
|
||||||
|
import openerp.conf.deprecation
|
||||||
from openerp.modules.registry import RegistryManager
|
from openerp.modules.registry import RegistryManager
|
||||||
|
|
||||||
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
def get_db_and_pool(db_name, force_demo=False, status=None, update_module=False):
|
def get_db_and_pool(db_name, force_demo=False, status=None, update_module=False):
|
||||||
"""Create and return a database connection and a newly initialized registry."""
|
"""Create and return a database connection and a newly initialized registry."""
|
||||||
|
assert openerp.conf.deprecation.openerp_pooler
|
||||||
|
_logger.warning('openerp.pooler.get_db_and_pool() is deprecated.')
|
||||||
registry = RegistryManager.get(db_name, force_demo, status, update_module)
|
registry = RegistryManager.get(db_name, force_demo, status, update_module)
|
||||||
return registry.db, registry
|
return registry.db, registry
|
||||||
|
|
||||||
|
|
||||||
def restart_pool(db_name, force_demo=False, status=None, update_module=False):
|
def restart_pool(db_name, force_demo=False, status=None, update_module=False):
|
||||||
"""Delete an existing registry and return a database connection and a newly initialized registry."""
|
"""Delete an existing registry and return a database connection and a newly initialized registry."""
|
||||||
|
_logger.warning('openerp.pooler.restart_pool() is deprecated.')
|
||||||
|
assert openerp.conf.deprecation.openerp_pooler
|
||||||
registry = RegistryManager.new(db_name, force_demo, status, update_module)
|
registry = RegistryManager.new(db_name, force_demo, status, update_module)
|
||||||
return registry.db, registry
|
return registry.db, registry
|
||||||
|
|
||||||
def get_db(db_name):
|
def get_db(db_name):
|
||||||
"""Return a database connection. The corresponding registry is initialized."""
|
"""Return a database connection. The corresponding registry is initialized."""
|
||||||
|
assert openerp.conf.deprecation.openerp_pooler
|
||||||
return get_db_and_pool(db_name)[0]
|
return get_db_and_pool(db_name)[0]
|
||||||
|
|
||||||
|
|
||||||
def get_pool(db_name, force_demo=False, status=None, update_module=False):
|
def get_pool(db_name, force_demo=False, status=None, update_module=False):
|
||||||
"""Return a model registry."""
|
"""Return a model registry."""
|
||||||
|
assert openerp.conf.deprecation.openerp_pooler
|
||||||
return get_db_and_pool(db_name, force_demo, status, update_module)[1]
|
return get_db_and_pool(db_name, force_demo, status, update_module)[1]
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
Loading…
Reference in New Issue