mirror of https://github.com/CIRCL/lookyloo
fix: Properly initialize Lookyloo once/process
parent
f56a6084a0
commit
7536bbb7f2
|
@ -44,7 +44,8 @@ else:
|
|||
|
||||
from .genericapi import api as generic_api
|
||||
from .helpers import (User, build_users_table, get_secret_key,
|
||||
load_user_from_request, src_request_ip, sri_load)
|
||||
load_user_from_request, src_request_ip, sri_load,
|
||||
get_lookyloo_instance)
|
||||
from .proxied import ReverseProxied
|
||||
|
||||
logging.config.dictConfig(get_config('logging'))
|
||||
|
@ -118,7 +119,7 @@ def logout():
|
|||
|
||||
# Config
|
||||
|
||||
lookyloo: Lookyloo = Lookyloo()
|
||||
lookyloo: Lookyloo = get_lookyloo_instance()
|
||||
|
||||
time_delta_on_index = get_config('generic', 'time_delta_on_index')
|
||||
blur_screenshot = get_config('generic', 'enable_default_blur_screenshot')
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
import base64
|
||||
import hashlib
|
||||
import importlib
|
||||
import json
|
||||
|
||||
from io import BytesIO
|
||||
|
@ -20,11 +19,11 @@ from lookyloo.comparator import Comparator
|
|||
from lookyloo.exceptions import MissingUUID, NoValidHarFile
|
||||
from lookyloo.lookyloo import CaptureSettings, Lookyloo
|
||||
|
||||
from .helpers import build_users_table, load_user_from_request, src_request_ip
|
||||
from .helpers import build_users_table, load_user_from_request, src_request_ip, get_lookyloo_instance
|
||||
|
||||
api = Namespace('GenericAPI', description='Generic Lookyloo API', path='/')
|
||||
|
||||
lookyloo = Lookyloo()
|
||||
lookyloo: Lookyloo = get_lookyloo_instance()
|
||||
comparator: Comparator = Comparator()
|
||||
|
||||
|
||||
|
|
|
@ -11,6 +11,16 @@ import flask_login # type: ignore
|
|||
from werkzeug.security import generate_password_hash
|
||||
|
||||
from lookyloo.default import get_config, get_homedir
|
||||
from lookyloo.lookyloo import Lookyloo
|
||||
|
||||
__global_lookyloo_instance = None
|
||||
|
||||
|
||||
def get_lookyloo_instance() -> Lookyloo:
|
||||
global __global_lookyloo_instance
|
||||
if __global_lookyloo_instance is None:
|
||||
__global_lookyloo_instance = Lookyloo()
|
||||
return __global_lookyloo_instance
|
||||
|
||||
|
||||
def src_request_ip(request) -> str:
|
||||
|
|
Loading…
Reference in New Issue