Skip to content

Commit b79fcdf

Browse files
committed
setup rpc
1 parent 590f1e7 commit b79fcdf

File tree

2 files changed

+10
-10
lines changed
  • services/web/server/src/simcore_service_webserver/products

2 files changed

+10
-10
lines changed

services/web/server/src/simcore_service_webserver/products/_controller/rpc.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
from models_library.products import CreditResultGet, ProductName
66
from servicelib.rabbitmq import RPCRouter
77

8-
from ...rabbitmq import get_rabbitmq_rpc_server
8+
from ...constants import APP_SETTINGS_KEY
9+
from ...rabbitmq import get_rabbitmq_rpc_server, setup_rabbitmq
910
from .. import _service
1011

1112
router = RPCRouter()
@@ -24,6 +25,12 @@ async def get_credit_amount(
2425
return credit_result_get
2526

2627

27-
async def register_rpc_routes_on_startup(app: web.Application):
28+
async def _register_rpc_routes_on_startup(app: web.Application):
2829
rpc_server = get_rabbitmq_rpc_server(app)
2930
await rpc_server.register_router(router, WEBSERVER_RPC_NAMESPACE, app)
31+
32+
33+
def setup_rpc(app: web.Application):
34+
setup_rabbitmq(app)
35+
if app[APP_SETTINGS_KEY].WEBSERVER_RABBITMQ:
36+
app.on_startup.append(_register_rpc_routes_on_startup)

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,15 @@ def setup_products(app: web.Application):
2929
# specially if this plugin is not set up to be loaded
3030
#
3131
from ..constants import APP_SETTINGS_KEY
32-
from ..rabbitmq import setup_rabbitmq
3332
from . import _web_events, _web_middlewares
3433
from ._controller import rest, rpc
3534

3635
assert app[APP_SETTINGS_KEY].WEBSERVER_PRODUCTS is True # nosec
3736

38-
# set middlewares
3937
app.middlewares.append(_web_middlewares.discover_product_middleware)
4038

41-
# setup rest
4239
app.router.add_routes(rest.routes)
4340

44-
# setup rpc
45-
setup_rabbitmq(app)
46-
if app[APP_SETTINGS_KEY].WEBSERVER_RABBITMQ:
47-
app.on_startup.append(rpc.register_rpc_routes_on_startup)
41+
rpc.setup_rpc(app)
4842

49-
# setup events
5043
_web_events.setup_web_events(app)

0 commit comments

Comments
 (0)