pre

Author: pcrespov

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

@@ -3,7 +3,7 @@
 from aiohttp import web
 from servicelib.aiohttp.application_setup import ensure_single_setup
 
-from ..products.plugin import setup_products
+from ..products.plugin import setup_products_without_rpc
 from ..rest.plugin import setup_rest
 from ..security.plugin import setup_security
 from . import _controller_rest
@@ -13,7 +13,7 @@
 
 @ensure_single_setup(__name__, logger=_logger)
 def setup_login_auth(app: web.Application):
-    setup_products(app, rpc_enabled=False)
+    setup_products_without_rpc(app)
     setup_security(app)
     setup_rest(app)
 

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

@@ -11,37 +11,45 @@
 import logging
 
 from aiohttp import web
-from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
+from servicelib.aiohttp.application_setup import (
+    ModuleCategory,
+    app_module_setup,
+    ensure_single_setup,
+)
 
 _logger = logging.getLogger(__name__)
 
 
-@app_module_setup(
-    __name__,
-    ModuleCategory.ADDON,
-    depends=["simcore_service_webserver.db"],
-    settings_name="WEBSERVER_PRODUCTS",
-    logger=_logger,
-)
-def setup_products(app: web.Application, *, rpc_enabled: bool = True):
+@ensure_single_setup(f"{__name__}.without_rpc", logger=_logger)
+def setup_products_without_rpc(app: web.Application):
     #
     # NOTE: internal import speeds up booting app
     # specially if this plugin is not set up to be loaded
     #
     from ..constants import APP_SETTINGS_KEY
     from . import _web_events, _web_middlewares
-    from ._controller import rest, rpc
+    from ._controller import rest
 
     assert app[APP_SETTINGS_KEY].WEBSERVER_PRODUCTS is True  # nosec
 
     # rest API
     app.middlewares.append(_web_middlewares.discover_product_middleware)
     app.router.add_routes(rest.routes)
 
-    # rpc API (optional)
-    if rpc_enabled:
-        rpc.setup_rpc(app)
-    else:
-        _logger.info("Skipping RPC api in products plugin")
-
     _web_events.setup_web_events(app)
+
+
+@app_module_setup(
+    __name__,
+    ModuleCategory.ADDON,
+    depends=["simcore_service_webserver.db"],
+    settings_name="WEBSERVER_PRODUCTS",
+    logger=_logger,
+)
+def setup_products(app: web.Application):
+    from ._controller import rpc
+
+    setup_products_without_rpc(app)
+
+    # rpc API (optional)
+    rpc.setup_rpc(app)