Fix Docker dev server script.

This commit is contained in:
grossmj committed 2020-10-19 18:28:01 +10:30
1 parent be6d4771d0
commit f20e16074f
4 files changed
+10 -24

No files matched your search

+2 -12
View File
@@ -14,7 +14,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import asyncio
from fastapi import FastAPI, Request
from fastapi.responses import JSONResponse
@@ -112,7 +111,7 @@ async def image_missing_error_handler(request: Request, exc: ImageMissingError):
@compute_api.exception_handler(NodeError)
async def image_missing_error_handler(request: Request, exc: NodeError):
async def node_error_handler(request: Request, exc: NodeError):
return JSONResponse(
status_code=409,
content={"message": str(exc), "exception": exc.__class__.__name__},
@@ -120,21 +119,12 @@ async def image_missing_error_handler(request: Request, exc: NodeError):
@compute_api.exception_handler(UbridgeError)
async def image_missing_error_handler(request: Request, exc: UbridgeError):
async def ubridge_error_handler(request: Request, exc: UbridgeError):
return JSONResponse(
status_code=409,
content={"message": str(exc), "exception": exc.__class__.__name__},
)
@compute_api.exception_handler(asyncio.CancelledError)
async def image_missing_error_handler(request: Request, exc: asyncio.CancelledError):
return JSONResponse(
status_code=408,
content={"message": "Request for '{}' cancelled".format(request.url.path)},
)
compute_api.include_router(capabilities.router, tags=["Capabilities"])
compute_api.include_router(compute.router, tags=["Compute"])
compute_api.include_router(notifications.router, tags=["Notifications"])
+3 -4
View File
@@ -148,7 +148,7 @@ async def start_capture(capture_data: dict, link: Link = Depends(dep_link)):
@router.post("/{link_id}/stop_capture",
status_code=status.HTTP_201_CREATED,
status_code=status.HTTP_204_NO_CONTENT,
response_model=schemas.Link,
responses=responses)
async def stop_capture(link: Link = Depends(dep_link)):
@@ -157,7 +157,6 @@ async def stop_capture(link: Link = Depends(dep_link)):
"""
await link.stop_capture()
return link.__json__()
@router.delete("/{link_id}",
@@ -201,7 +200,7 @@ async def pcap(request: Request, link: Link = Depends(dep_link)):
headers['Router-Host'] = request.client.host
body = await request.body()
async def compute_pcpa_stream():
async def compute_pcap_stream():
connector = aiohttp.TCPConnector(limit=None, force_close=True)
async with aiohttp.ClientSession(connector=connector, headers=headers) as session:
@@ -211,4 +210,4 @@ async def pcap(request: Request, link: Link = Depends(dep_link)):
break
yield data
return StreamingResponse(compute_pcpa_stream(), media_type="application/vnd.tcpdump.pcap")
return StreamingResponse(compute_pcap_stream(), media_type="application/vnd.tcpdump.pcap")