Revision 79589f25
| b/lib/http/__init__.py | ||
|---|---|---|
| 231 | 231 |
code = 412 |
| 232 | 232 |
|
| 233 | 233 |
|
| 234 |
class HttpInternalError(HttpException): |
|
| 234 |
class HttpInternalServerError(HttpException):
|
|
| 235 | 235 |
"""500 Internal Server Error |
| 236 | 236 |
|
| 237 | 237 |
RFC2616, 10.5.1: The server encountered an unexpected condition which |
| b/lib/http/server.py | ||
|---|---|---|
| 316 | 316 |
raise |
| 317 | 317 |
except Exception, err: |
| 318 | 318 |
logging.exception("Caught exception")
|
| 319 |
raise http.HttpInternalError(message=str(err)) |
|
| 319 |
raise http.HttpInternalServerError(message=str(err))
|
|
| 320 | 320 |
except: |
| 321 | 321 |
logging.exception("Unknown exception")
|
| 322 |
raise http.HttpInternalError(message="Unknown error") |
|
| 322 |
raise http.HttpInternalServerError(message="Unknown error")
|
|
| 323 | 323 |
|
| 324 | 324 |
# TODO: Content-type |
| 325 | 325 |
encoder = http.HttpJsonConverter() |
| b/lib/rapi/rlib1.py | ||
|---|---|---|
| 232 | 232 |
diagnose_data = ganeti.cli.SubmitOpCode(op) |
| 233 | 233 |
|
| 234 | 234 |
if not isinstance(diagnose_data, list): |
| 235 |
raise http.HttpInternalError(message="Can't get OS list") |
|
| 235 |
raise http.HttpInternalServerError(message="Can't get OS list")
|
|
| 236 | 236 |
|
| 237 | 237 |
return [row[0] for row in diagnose_data if row[1]] |
Also available in: Unified diff