diff --git a/perxis/extensions/bootstrap.py b/perxis/extensions/bootstrap.py index 37769c2df0eac25ee24956af51b664e75ecedc22..9ff0e0bd389bded64edce40577796601905df51c 100644 --- a/perxis/extensions/bootstrap.py +++ b/perxis/extensions/bootstrap.py @@ -1,3 +1,5 @@ +import asyncio + import aiocron import grpc import logging @@ -23,6 +25,8 @@ def bootstrap( 'x-perxis-access', 'system' ) + loop = asyncio.get_event_loop() + @aiocron.crontab('* * * * *', start=False) def register_extension(): ext_manager_stub.RegisterExtensions(manager_pb2.RegisterExtensionsRequest( @@ -30,7 +34,7 @@ def bootstrap( )) logger.info(f"Расширение {ext_descriptor.extension} зарегистрировано в perxis") - with grpc.insecure_channel(ext_manager_host) as extensions_manager_channel: + with grpc.aio.insecure_channel(ext_manager_host) as extensions_manager_channel: intercept_channel_extensions_manager_channel = grpc.intercept_channel(extensions_manager_channel, interceptor) ext_manager_stub = manager_pb2_grpc.ExtensionManagerStub(intercept_channel_extensions_manager_channel) @@ -53,7 +57,7 @@ def bootstrap( register_extension.start() - with grpc.insecure_channel(content_host) as content_channel: + with grpc.aio.insecure_channel(content_host) as content_channel: intercepted_content_channel = grpc.intercept_channel(content_channel, interceptor) collections_stub = collections_pb2_grpc.CollectionsStub(intercepted_content_channel) @@ -61,12 +65,21 @@ def bootstrap( clients_stub = clients_pb2_grpc.ClientsStub(intercepted_content_channel) environments_stub = environments_pb2_grpc.EnvironmentsStub(intercepted_content_channel) - server = grpc.server(futures.ThreadPoolExecutor(max_workers=10)) - extension_pb2_grpc.add_ExtensionServicer_to_server( - servicer_cls( - collections_stub, environments_stub, roles_stub, clients_stub - ), server + server = grpc.aio.server(futures.ThreadPoolExecutor(max_workers=10)) + loop.create_task( + extension_pb2_grpc.add_ExtensionServicer_to_server( + servicer_cls( + collections_stub, environments_stub, roles_stub, clients_stub + ), server + ) ) server.add_insecure_port("[::]:50051") - server.start() - server.wait_for_termination() + loop.create_task(server.start()) + loop.create_task(server.wait_for_termination()) + + try: + loop.run_forever() + finally: + loop.close() + loop.stop() + logging.info('Successfully shutdown service') diff --git a/setup.py b/setup.py index 950d4333f8d62956a2b96382964ba2b6f3e789d1..b1688574feac249c8f199dc2e78be25b64447040 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ def load_requirements(): setup( name='perxis', - version='1.0.5', + version='1.0.6', description='Perxis python client', long_description=long_description, long_description_content_type='text/markdown',