From 0600480db3ca08f4d30f45f2c35d42b9b9163d5e Mon Sep 17 00:00:00 2001 From: Marian Steinbach Date: Fri, 12 Apr 2019 09:14:56 +0200 Subject: [PATCH] Adapt SiteDetails to use ES --- main.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/main.py b/main.py index ff300ee..fe12b82 100644 --- a/main.py +++ b/main.py @@ -175,16 +175,18 @@ class SiteDetails(object): 'Bad request', 'The parameter url must not be empty') - key = datastore_client.key(spider_results_kind, req.get_param('url')) - entity = datastore_client.get(key) + entity = es.get(index=es_index_name, doc_type=es_doc_type, id=url) if entity is None: raise falcon.HTTPError(falcon.HTTP_404, 'Not found', 'A site with this URL does not exist') - maxage = 24 * 60 * 60 # 24 hours in seconds + if 'url' in entity['_source']: + del entity['_source']['url'] + + maxage = 5 * 60 # 5 minutes in seconds resp.cache_control = ["max_age=%d" % maxage] - resp.media = dict(entity) + resp.media = entity['_source'] class SiteScreenshots(object):