CIRCL
/
lookyloo
mirror of https://github.com/CIRCL/lookyloo
2
0
Fork 0
Code Issues Releases Wiki Activity

fix: Avoid loading the cache multiple times

pull/42/head
Raphaël Vinot 2019-04-05 15:07:22 +02:00
parent 6b10e74470
commit da3d1fe392
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/start_website.py
View File

@ -4,9 +4,12 @@
import time import time
import signal import signal
from subprocess import Popen from subprocess import Popen
from lookyloo.helpers import get_homedir, shutdown_requested, set_running, unset_running from lookyloo.helpers import get_homedir, shutdown_requested, set_running, unset_running, get_socket_path
if __name__ == '__main__': if __name__ == '__main__':
r = StrictRedis(unix_socket_path=get_socket_path('cache'), db=1)
r.delete('cache_loaded')
website_dir = get_homedir() / 'website' website_dir = get_homedir() / 'website'
Popen([str(website_dir / '3rdparty.sh')], cwd=website_dir) Popen([str(website_dir / '3rdparty.sh')], cwd=website_dir)
try: try:

9
lookyloo/lookyloo.py
View File

@ -37,7 +37,8 @@ class Lookyloo():
if not self.scrape_dir.exists(): if not self.scrape_dir.exists():
self.scrape_dir.mkdir(parents=True, exist_ok=True) self.scrape_dir.mkdir(parents=True, exist_ok=True)
self._init_existing_dumps() if not self.redis.exists('cache_loaded'):
self._init_existing_dumps()
# Try to reach sanejs # Try to reach sanejs
self.sanejs = SaneJS() self.sanejs = SaneJS()
@ -68,7 +69,7 @@ class Lookyloo():
cache = {'uuid': uuid, 'title': title} cache = {'uuid': uuid, 'title': title}
if (report_dir / 'no_index').exists(): # If the folders claims anonymity if (report_dir / 'no_index').exists(): # If the folders claims anonymity
cache['no_index'] = 1 cache['no_index'] = 1
if uuid and not self.redis.hexists('lookup_dirs', uuid): if uuid and not self.redis.exists(str(report_dir)):
self.redis.hmset(str(report_dir), cache) self.redis.hmset(str(report_dir), cache)
self.redis.hset('lookup_dirs', uuid, str(report_dir)) self.redis.hset('lookup_dirs', uuid, str(report_dir))
@ -79,7 +80,9 @@ class Lookyloo():
def _init_existing_dumps(self): def _init_existing_dumps(self):
for report_dir in self.report_dirs: for report_dir in self.report_dirs:
self._set_report_cache(report_dir) if report_dir.exists():
self._set_report_cache(report_dir)
self.redis.set('cache_loaded', 1)
@property @property
def report_dirs(self): def report_dirs(self):