Skip to content

Commit b0ec158

Browse files
committed
not active
1 parent 4e12b09 commit b0ec158

File tree

1 file changed

+11
-14
lines changed
  • services/web/server/src/simcore_service_webserver/db

1 file changed

+11
-14
lines changed

services/web/server/src/simcore_service_webserver/db/plugin.py

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,20 @@
88
from servicelib.aiohttp.application_keys import APP_AIOPG_ENGINE_KEY
99
from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
1010

11-
from . import _aiopg, _asyncpg
11+
from . import _aiopg
1212

1313
_logger = logging.getLogger(__name__)
1414

1515

16+
# API
17+
18+
# aiopg helpers
19+
get_database_engine = _aiopg.get_database_engine
20+
get_aiopg_engine_state = _aiopg.get_engine_state
21+
is_service_responsive = _aiopg.is_service_responsive
22+
is_service_enabled = _aiopg.is_service_enabled
23+
24+
1625
@app_module_setup(
1726
"simcore_service_webserver.db",
1827
ModuleCategory.ADDON,
@@ -23,19 +32,7 @@ def setup_db(app: web.Application):
2332

2433
# ensures keys exist
2534
app[APP_AIOPG_ENGINE_KEY] = None
35+
assert get_database_engine(app) is None # nosec
2636

2737
# init engines
2838
app.cleanup_ctx.append(_aiopg.postgres_cleanup_ctx)
29-
app.cleanup_ctx.append(_asyncpg.postgres_cleanup_ctx)
30-
31-
32-
# API
33-
34-
# aiopg helpers
35-
get_database_engine = _aiopg.get_database_engine
36-
get_aiopg_engine_state = _aiopg.get_engine_state
37-
is_service_responsive = _aiopg.is_service_responsive
38-
is_service_enabled = _aiopg.is_service_enabled
39-
40-
# asyncpg helpers
41-
get_asyncpg_engine = _asyncpg.get_async_engine

0 commit comments

Comments
 (0)