From 0f6d5c164954ef83973d0e188aa67e2b8ea17ce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Sat, 25 May 2024 12:29:01 +0200
Subject: [PATCH] fix: Speedup quick cache init

---
 bin/async_capture.py     |  2 +-
 lookyloo/capturecache.py | 10 +++++++---
 website/web/__init__.py  |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bin/async_capture.py b/bin/async_capture.py
index 7b85337c..2b741a5d 100755
--- a/bin/async_capture.py
+++ b/bin/async_capture.py
@@ -30,7 +30,7 @@ class AsyncCapture(AbstractManager):
         self.script_name = 'async_capture'
         self.only_global_lookups: bool = get_config('generic', 'only_global_lookups')
         self.capture_dir: Path = get_captures_dir()
-        self.lookyloo = Lookyloo()
+        self.lookyloo = Lookyloo(cache_max_size=1)
 
         self.captures: set[asyncio.Task] = set()  # type: ignore[type-arg]
 
diff --git a/lookyloo/capturecache.py b/lookyloo/capturecache.py
index 52029825..c4b7a55e 100644
--- a/lookyloo/capturecache.py
+++ b/lookyloo/capturecache.py
@@ -28,7 +28,7 @@ from pyipasnhistory import IPASNHistory  # type: ignore[attr-defined]
 from redis import Redis
 
 from .context import Context
-from .helpers import get_captures_dir, is_locked, make_ts_from_dirname
+from .helpers import get_captures_dir, is_locked
 from .indexing import Indexing
 from .default import LookylooException, try_make_file, get_config
 from .exceptions import MissingCaptureDirectory, NoValidHarFile, MissingUUID, TreeNeedsRebuild
@@ -187,6 +187,7 @@ class CapturesIndex(Mapping):  # type: ignore[type-arg]
             self.ipasnhistory: IPASNHistory | None = IPASNHistory()
             if not self.ipasnhistory.is_up:
                 self.ipasnhistory = None
+            self.logger.info('IPASN History ready')
         except Exception as e:
             # Unable to setup IPASN History
             self.logger.warning(f'Unable to setup IPASN History: {e}')
@@ -195,6 +196,7 @@ class CapturesIndex(Mapping):  # type: ignore[type-arg]
             self.cloudflare: Cloudflare | None = Cloudflare()
             if not self.cloudflare.available:
                 self.cloudflare = None
+            self.logger.info('Cloudflare ready')
         except Exception as e:
             self.logger.warning(f'Unable to setup Cloudflare: {e}')
             self.cloudflare = None
@@ -266,7 +268,6 @@ class CapturesIndex(Mapping):  # type: ignore[type-arg]
                 continue
             has_new_cached_captures = True
             p.hgetall(directory)
-            recent_captures[uuid] = make_ts_from_dirname(directory.rsplit('/', 1)[-1]).timestamp()
         if not has_new_cached_captures:
             return
         for cache in p.execute():
@@ -278,7 +279,10 @@ class CapturesIndex(Mapping):  # type: ignore[type-arg]
                 self.logger.warning(f'Unable to initialize the cache: {e}')
                 continue
             self.__cache[cc.uuid] = cc
-        self.redis.zadd('recent_captures', recent_captures)
+            if hasattr(cc, 'timestamp'):
+                recent_captures[uuid] = cc.timestamp.timestamp()
+        if recent_captures:
+            self.redis.zadd('recent_captures', recent_captures)
 
     def _get_capture_dir(self, uuid: str) -> str:
         # Try to get from the recent captures cache in redis
diff --git a/website/web/__init__.py b/website/web/__init__.py
index 965c532d..08448f15 100644
--- a/website/web/__init__.py
+++ b/website/web/__init__.py
@@ -80,14 +80,14 @@ user_agents = UserAgents()
 
 if get_config('generic', 'index_is_capture'):
     @app.route('/', methods=['GET'])
-    def landing_page() -> WerkzeugResponse:
+    def landing_page() -> WerkzeugResponse | str:
         if request.method == 'HEAD':
             # Just returns ack if the webserver is running
             return 'Ack'
         return redirect(url_for('capture_web'))
 else:
     @app.route('/', methods=['GET'])
-    def landing_page() -> WerkzeugResponse:
+    def landing_page() -> WerkzeugResponse | str:
         if request.method == 'HEAD':
             # Just returns ack if the webserver is running
             return 'Ack'