From e6240b14eec577d84282209d5f9b0955b792830c Mon Sep 17 00:00:00 2001 From: hackrush Date: Mon, 25 Feb 2019 12:39:44 +0530 Subject: [PATCH] Using NamedPipeSite(aiohttp, not committed) --- lbrynet/extras/cli.py | 3 ++- lbrynet/extras/daemon/Daemon.py | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lbrynet/extras/cli.py b/lbrynet/extras/cli.py index 8745b13c5..3da85acd7 100644 --- a/lbrynet/extras/cli.py +++ b/lbrynet/extras/cli.py @@ -25,7 +25,8 @@ def display(data): async def execute_command(conf, method, params): - async with aiohttp.ClientSession() as session: + conn = aiohttp.NamedPipeConnector(path=r'\\.\pipe\lbrypipe') + async with aiohttp.ClientSession(connector=conn) as session: try: message = {'method': method, 'params': params} async with session.get(conf.api_connection_url, json=message) as resp: diff --git a/lbrynet/extras/daemon/Daemon.py b/lbrynet/extras/daemon/Daemon.py index 85300ebc7..9c986af03 100644 --- a/lbrynet/extras/daemon/Daemon.py +++ b/lbrynet/extras/daemon/Daemon.py @@ -286,6 +286,7 @@ class Daemon(metaclass=JSONRPCServerType): logging.getLogger('aiohttp.access').setLevel(logging.WARN) app = web.Application() app.router.add_get('/lbryapi', self.handle_old_jsonrpc) + app.router.add_get('/', self.handle_old_jsonrpc) app.router.add_post('/lbryapi', self.handle_old_jsonrpc) app.router.add_post('/', self.handle_old_jsonrpc) self.runner = web.AppRunner(app) @@ -414,9 +415,11 @@ class Daemon(metaclass=JSONRPCServerType): await self.runner.setup() try: - loop = asyncio.get_event_loop() - await loop.start_serving_pipe(lambda : NamedPipeServer(self.handle_pipe_request), PIPE_NAME) - log.info('lbrynet API listening on pipe %s', PIPE_NAME) + site = web.NamedPipeSite(self.runner, PIPE_NAME) + await site.start() + # loop = asyncio.get_event_loop() + # await loop.start_serving_pipe(lambda : NamedPipeServer(self.handle_pipe_request), PIPE_NAME) + log.info('lbrynet API listening on pipe %s', site.name) except Exception as e: log.error(str(e))