NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-11-17 01:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Try to improve error reporting when streaming a PCAP file. Ref #2235.

Browse Source
This commit is contained in:
grossmj 2017-09-01 17:10:24 +07:00
parent ee486b32bd
commit c22229101f
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/controller/compute.py
View File

@ -348,6 +348,12 @@ class Compute:
response = yield from self._session().request("GET", url, auth=self._auth, timeout=None) response = yield from self._session().request("GET", url, auth=self._auth, timeout=None)
if response.status == 404: if response.status == 404:
raise aiohttp.web.HTTPNotFound(text="{} not found on compute".format(path)) raise aiohttp.web.HTTPNotFound(text="{} not found on compute".format(path))
elif response.status == 403:
raise aiohttp.web.HTTPForbidden(text="forbidden to open {} on compute".format(path))
elif response.status != 200:
raise aiohttp.web.HTTPInternalServerError(text="Unexpected error {}: {}: while opening {} on compute".format(response.status,
response.reason,
path))
return StreamResponse(response) return StreamResponse(response)
@asyncio.coroutine @asyncio.coroutine

5
gns3server/controller/link.py
View File

@ -290,7 +290,12 @@ class Link:
Dump a pcap file on disk Dump a pcap file on disk
""" """
try:
stream_content = yield from self.read_pcap_from_source() stream_content = yield from self.read_pcap_from_source()
except aiohttp.web.HTTPException as e:
log.error("Could not stream pcap file: error {}: {}".format(e.status, e.text))
self._capturing = False
self._project.controller.notification.emit("link.updated", self.__json__())
with stream_content as stream: with stream_content as stream:
with open(self.capture_file_path, "wb+") as f: with open(self.capture_file_path, "wb+") as f:
while self._capturing: while self._capturing: