Update create index fixes#446 (#447)

* fixes#431

* fixes#431 (#432)

* removing old packetmail feeds (#433)

* update MANIFEST.in to include html template files (#434)

* fix for cif-tokens delete for ES

* fixed manifest to include html template files

* fixes #446

* fix failing tests

cif/store/zelasticsearch/indicator.py

@@ -37,6 +37,7 @@ def __init__(self, *args, **kwargs):
         self.partition = PARTITION
         self.idx = self._current_index()
         self.last_index_check = datetime.now() - timedelta(minutes=5)
+        self.last_index_value = None
         self.handle = connections.get_connection()
         self.lockm = LockManager(self.handle, logger)
 
@@ -63,11 +64,12 @@ def _current_index(self):
     def _create_index(self):
         # https://github.com/csirtgadgets/massive-octo-spice/blob/develop/elasticsearch/observables.json
         # http://elasticsearch-py.readthedocs.org/en/master/api.html#elasticsearch.Elasticsearch.bulk
-        idx = self._current_index()
 
         # every time we check it does a HEAD req
-        if (datetime.utcnow() - self.last_index_check) < timedelta(minutes=2):
-            return idx
+        if self.last_index_value and (datetime.utcnow() - self.last_index_check) < timedelta(minutes=2):
+            return self.last_index_value
+
+        idx = self._current_index()
 
         if not self.handle.indices.exists(idx):
             index = Index(idx)
@@ -78,6 +80,7 @@ def _create_index(self):
             self.handle.indices.flush(idx)
 
         self.last_index_check = datetime.utcnow()
+        self.last_index_value = idx
         return idx
 
     def search(self, token, filters, sort='reporttime', raw=False, timeout=TIMEOUT):