NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-10-24 20:02:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2974 from GNS3/bugfix/2935

Browse Source 
fix: update error logging to handle exceptions in WebSockets
This commit is contained in:
Jeremy Grossmann 2026-10-10 12:40:48 +02:00 committed by GitHub
commit 2e3557d534
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gns3server/api/server.py
View File

@ -170,43 +170,50 @@ async def redoc_html():
@app.exception_handler(ControllerError) @app.exception_handler(ControllerError)
async def controller_error_handler(request: Request, exc: ControllerError): async def controller_error_handler(request: Request, exc: ControllerError):
log.error(f"Controller error in {request.url.path} ({request.method}): {exc}") method = getattr(request, "method", "WebSocket")
log.error(f"Controller error in {request.url.path} ({method}): {exc}")
return error_response(status.HTTP_409_CONFLICT, str(exc), exc.code, exc.details) return error_response(status.HTTP_409_CONFLICT, str(exc), exc.code, exc.details)
@app.exception_handler(ControllerTimeoutError) @app.exception_handler(ControllerTimeoutError)
async def controller_timeout_error_handler(request: Request, exc: ControllerTimeoutError): async def controller_timeout_error_handler(request: Request, exc: ControllerTimeoutError):
log.error(f"Controller timeout error in {request.url.path} ({request.method}): {exc}") method = getattr(request, "method", "WebSocket")
log.error(f"Controller timeout error in {request.url.path} ({method}): {exc}")
return error_response(status.HTTP_408_REQUEST_TIMEOUT, str(exc), exc.code, exc.details) return error_response(status.HTTP_408_REQUEST_TIMEOUT, str(exc), exc.code, exc.details)
@app.exception_handler(ControllerUnauthorizedError) @app.exception_handler(ControllerUnauthorizedError)
async def controller_unauthorized_error_handler(request: Request, exc: ControllerUnauthorizedError): async def controller_unauthorized_error_handler(request: Request, exc: ControllerUnauthorizedError):
log.error(f"Controller unauthorized error in {request.url.path} ({request.method}): {exc}") method = getattr(request, "method", "WebSocket")
log.error(f"Controller unauthorized error in {request.url.path} ({method}): {exc}")
return error_response(status.HTTP_401_UNAUTHORIZED, str(exc), exc.code, exc.details) return error_response(status.HTTP_401_UNAUTHORIZED, str(exc), exc.code, exc.details)
@app.exception_handler(ControllerForbiddenError) @app.exception_handler(ControllerForbiddenError)
async def controller_forbidden_error_handler(request: Request, exc: ControllerForbiddenError): async def controller_forbidden_error_handler(request: Request, exc: ControllerForbiddenError):
log.error(f"Controller forbidden error in {request.url.path} ({request.method}): {exc}") method = getattr(request, "method", "WebSocket")
log.error(f"Controller forbidden error in {request.url.path} ({method}): {exc}")
return error_response(status.HTTP_403_FORBIDDEN, str(exc), exc.code, exc.details) return error_response(status.HTTP_403_FORBIDDEN, str(exc), exc.code, exc.details)
@app.exception_handler(ControllerNotFoundError) @app.exception_handler(ControllerNotFoundError)
async def controller_not_found_error_handler(request: Request, exc: ControllerNotFoundError): async def controller_not_found_error_handler(request: Request, exc: ControllerNotFoundError):
log.error(f"Controller not found error in {request.url.path} ({request.method}): {exc}") method = getattr(request, "method", "WebSocket")
log.error(f"Controller not found error in {request.url.path} ({method}): {exc}")
return error_response(status.HTTP_404_NOT_FOUND, str(exc), exc.code, exc.details) return error_response(status.HTTP_404_NOT_FOUND, str(exc), exc.code, exc.details)
@app.exception_handler(ControllerBadRequestError) @app.exception_handler(ControllerBadRequestError)
async def controller_bad_request_error_handler(request: Request, exc: ControllerBadRequestError): async def controller_bad_request_error_handler(request: Request, exc: ControllerBadRequestError):
log.error(f"Controller bad request error in {request.url.path} ({request.method}): {exc}") method = getattr(request, "method", "WebSocket")
log.error(f"Controller bad request error in {request.url.path} ({method}): {exc}")
return error_response(status.HTTP_400_BAD_REQUEST, str(exc), exc.code, exc.details) return error_response(status.HTTP_400_BAD_REQUEST, str(exc), exc.code, exc.details)
@app.exception_handler(ComputeConflictError) @app.exception_handler(ComputeConflictError)
async def compute_conflict_error_handler(request: Request, exc: ComputeConflictError): async def compute_conflict_error_handler(request: Request, exc: ComputeConflictError):
log.error(f"Controller received error from compute for request '{exc.url()}': {exc}") method = getattr(request, "method", "WebSocket")
log.error(f"Controller received error from compute for request '{exc.url()}' ({method}): {exc}")
return error_response(status.HTTP_409_CONFLICT, str(exc), exc.code, exc.details) return error_response(status.HTTP_409_CONFLICT, str(exc), exc.code, exc.details)
@ -217,7 +224,8 @@ async def http_exception_handler(request: Request, exc: StarletteHTTPException):
@app.exception_handler(SQLAlchemyError) @app.exception_handler(SQLAlchemyError)
async def sqlalchemy_error_handler(request: Request, exc: SQLAlchemyError): async def sqlalchemy_error_handler(request: Request, exc: SQLAlchemyError):
log.error(f"Controller database error in {request.url.path} ({request.method}): {exc}") method = getattr(request, "method", "WebSocket")
log.error(f"Controller database error in {request.url.path} ({method}): {exc}")
return error_response( return error_response(
status.HTTP_500_INTERNAL_SERVER_ERROR, status.HTTP_500_INTERNAL_SERVER_ERROR,
"Database error detected, please check logs to find details", "Database error detected, please check logs to find details",
@ -227,7 +235,8 @@ async def sqlalchemy_error_handler(request: Request, exc: SQLAlchemyError):
@app.exception_handler(RequestValidationError) @app.exception_handler(RequestValidationError)
async def validation_exception_handler(request: Request, exc: RequestValidationError): async def validation_exception_handler(request: Request, exc: RequestValidationError):
log.error(f"Request validation error in {request.url.path} ({request.method}): {exc}") method = getattr(request, "method", "WebSocket")
log.error(f"Request validation error in {request.url.path} ({method}): {exc}")
errors = [ errors = [
{"loc": list(error.get("loc", ())), "msg": error.get("msg"), "type": error.get("type")} {"loc": list(error.get("loc", ())), "msg": error.get("msg"), "type": error.get("type")}
for error in exc.errors() for error in exc.errors()