Compare commits

..

No commits in common. "c356f58d8a9106aeca14b40d98f95560bc2a0198" and "f0455984efaa4d937b7c8274871caa8dfa28b92c" have entirely different histories.

2 changed files with 4 additions and 14 deletions

View File

@ -15,7 +15,6 @@ INDEX_MAIN = "main"
INDEX_RESTRICTED = "restricted"
INDEX_META = "meta"
INDEX_INT = "internal"
INDEX_RULE_STORAGE = "rule_storage"
MAIN_SIZES = ["1", "5", "15", "30", "50", "100", "250", "500", "1000"]
MAIN_SIZES_ANON = ["1", "5", "15", "30", "50", "100"]

View File

@ -195,22 +195,10 @@ class StorageBackend(ABC):
message = f"Error: {response.info['error']['root_cause'][0]['type']}"
message_class = "danger"
return {"message": message, "class": message_class}
if "took" in response:
if response["took"] is None:
return None
if len(response["hits"]["hits"]) == 0:
message = "No results."
message_class = "danger"
time_took = (time.process_time() - start) * 1000
# Round to 3 significant figures
time_took_rounded = round(
time_took, 3 - int(floor(log10(abs(time_took)))) - 1
)
return {
"message": message,
"class": message_class,
"took": time_took_rounded,
}
return {"message": message, "class": message_class}
# For Druid
if "error" in response:
@ -222,6 +210,9 @@ class StorageBackend(ABC):
return context
else:
return response
if "took" in response:
if response["took"] is None:
return None
# Removed for now, no point given we have restricted indexes
# self.filter_blacklisted(user, response)