aboutsummaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@robocracy.org>2021-11-12 11:11:08 -0800
committerBryan Newbold <bnewbold@robocracy.org>2021-11-12 11:11:08 -0800
commit51b81e0c48a1258958ff215bc5da29bef4df4009 (patch)
tree045ce3b395fe4d4d2e35ea26084efd966edf5bc0 /python
parent6ad9d24e4d7d901d6fc394e6e91575f6acba7ff4 (diff)
downloadfatcat-51b81e0c48a1258958ff215bc5da29bef4df4009.tar.gz
fatcat-51b81e0c48a1258958ff215bc5da29bef4df4009.zip
web: handle ES non-int error codes better
Diffstat (limited to 'python')
-rw-r--r--python/fatcat_web/search.py21
1 files changed, 12 insertions, 9 deletions
diff --git a/python/fatcat_web/search.py b/python/fatcat_web/search.py
index 06660cd6..fdfc4d80 100644
--- a/python/fatcat_web/search.py
+++ b/python/fatcat_web/search.py
@@ -6,7 +6,7 @@ the formal API)
import datetime
import sys
from dataclasses import dataclass
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple, Union
import elasticsearch
import elasticsearch_dsl.response
@@ -16,9 +16,14 @@ from fatcat_web import app
class FatcatSearchError(Exception):
- def __init__(self, status_code: int, name: str, description: str = None):
- if status_code == "N/A":
- status_code = 503
+ def __init__(self, status_code: Union[int, str], name: str, description: str = None):
+ if status_code == "TIMEOUT":
+ status_code = 504
+ elif isinstance(status_code, str):
+ try:
+ status_code = int(status_code)
+ except ValueError:
+ status_code = 503
self.status_code = status_code
self.name = name
self.description = description
@@ -138,11 +143,9 @@ def wrap_es_execution(search: Search) -> Any:
assert isinstance(e.info, dict)
if e.info.get("error", {}).get("root_cause", {}):
description = str(e.info["error"]["root_cause"][0].get("reason"))
- raise FatcatSearchError(int(e.status_code), str(e.error), description)
+ raise FatcatSearchError(e.status_code, str(e.error), description)
except elasticsearch.exceptions.ConnectionError as e:
- raise FatcatSearchError(
- int(e.status_code), "ConnectionError: search engine not available"
- )
+ raise FatcatSearchError(e.status_code, "ConnectionError: search engine not available")
except elasticsearch.exceptions.TransportError as e:
# all other errors
print("elasticsearch non-200 status code: {}".format(e.info), file=sys.stderr)
@@ -150,7 +153,7 @@ def wrap_es_execution(search: Search) -> Any:
assert isinstance(e.info, dict)
if e.info and e.info.get("error", {}).get("root_cause", {}):
description = str(e.info["error"]["root_cause"][0].get("reason"))
- raise FatcatSearchError(int(e.status_code), str(e.error), description)
+ raise FatcatSearchError(e.status_code, str(e.error), description)
return resp