ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-22 06:07:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make HTTP support more reliable with home made HTTP server

Browse Source
This commit is contained in:
Julien Duponchelle 2016-05-04 16:32:45 +02:00
parent 9beca700a5
commit 56c153af79
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gns3server/utils/asyncio/raw_command_server.py
View File

@ -38,9 +38,12 @@ class AsyncioRawCommandServer:
""" """
self._command = command self._command = command
self._replaces = replaces self._replaces = replaces
# We limit number of process
self._lock = asyncio.Semaphore(value=4)
@asyncio.coroutine @asyncio.coroutine
def run(self, network_reader, network_writer): def run(self, network_reader, network_writer):
yield from self._lock.acquire()
process = yield from asyncio.subprocess.create_subprocess_exec(*self._command, process = yield from asyncio.subprocess.create_subprocess_exec(*self._command,
stdout=asyncio.subprocess.PIPE, stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.STDOUT, stderr=asyncio.subprocess.STDOUT,
@ -49,11 +52,16 @@ class AsyncioRawCommandServer:
yield from self._process(network_reader, network_writer, process.stdout, process.stdin) yield from self._process(network_reader, network_writer, process.stdout, process.stdin)
except ConnectionResetError: except ConnectionResetError:
network_writer.close() network_writer.close()
if process.returncode is None:
process.kill()
yield from process.wait()
self._lock.release()
@asyncio.coroutine @asyncio.coroutine
def _process(self, network_reader, network_writer, process_reader, process_writer): def _process(self, network_reader, network_writer, process_reader, process_writer):
network_read = asyncio.async(network_reader.read(READ_SIZE)) network_read = asyncio.async(network_reader.read(READ_SIZE))
reader_read = asyncio.async(process_reader.read(READ_SIZE)) reader_read = asyncio.async(process_reader.read(READ_SIZE))
timeout = 30
while True: while True:
done, pending = yield from asyncio.wait( done, pending = yield from asyncio.wait(
@ -61,10 +69,12 @@ class AsyncioRawCommandServer:
network_read, network_read,
reader_read reader_read
], ],
timeout=timeout,
return_when=asyncio.FIRST_COMPLETED) return_when=asyncio.FIRST_COMPLETED)
if len(done) == 0:
raise ConnectionResetError()
for coro in done: for coro in done:
data = coro.result() data = coro.result()
if coro == network_read: if coro == network_read:
if network_reader.at_eof(): if network_reader.at_eof():
raise ConnectionResetError() raise ConnectionResetError()
@ -81,6 +91,8 @@ class AsyncioRawCommandServer:
for replace in self._replaces: for replace in self._replaces:
data = data.replace(replace[0], replace[1]) data = data.replace(replace[0], replace[1])
timeout = 2 # We reduce the timeout when the process start to return stuff to avoid problem with server not closing the connection
network_writer.write(data) network_writer.write(data)
yield from network_writer.drain() yield from network_writer.drain()