api.py (ec2-api-14.0.1) | : | api.py (ec2-api-15.0.0) | ||
---|---|---|---|---|
skipping to change at line 42 | skipping to change at line 42 | |||
from ec2api import exception | from ec2api import exception | |||
CONF = cfg.CONF | CONF = cfg.CONF | |||
_MASTER_FACADE = None | _MASTER_FACADE = None | |||
def _create_facade_lazily(): | def _create_facade_lazily(): | |||
global _MASTER_FACADE | global _MASTER_FACADE | |||
if _MASTER_FACADE is None: | if _MASTER_FACADE is None: | |||
_MASTER_FACADE = db_session.EngineFacade.from_config(CONF) | # FIXME(priteau): Remove autocommit=True (and ideally use of | |||
# LegacyEngineFacade) asap since it's not compatible with SQLAlchemy | ||||
# 2.0. | ||||
_MASTER_FACADE = db_session.EngineFacade.from_config(CONF, | ||||
autocommit=True) | ||||
return _MASTER_FACADE | return _MASTER_FACADE | |||
def get_engine(): | def get_engine(): | |||
facade = _create_facade_lazily() | facade = _create_facade_lazily() | |||
return facade.get_engine() | return facade.get_engine() | |||
def get_session(**kwargs): | def get_session(**kwargs): | |||
facade = _create_facade_lazily() | facade = _create_facade_lazily() | |||
return facade.get_session(**kwargs) | return facade.get_session(**kwargs) | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 5 lines changed or added |