mirror of
https://github.com/searxng/searxng.git
synced 2026-06-07 18:37:50 +02:00
This reverts commit 9d49a9f344.
This commit is contained in:
+6
-14
@@ -327,6 +327,7 @@ class SQLiteAppl(abc.ABC):
|
||||
|
||||
if self._init_done:
|
||||
return False
|
||||
self._init_done = True
|
||||
|
||||
logger.debug("init DB: %s", self.db_url)
|
||||
self.properties.init(conn)
|
||||
@@ -341,7 +342,6 @@ class SQLiteAppl(abc.ABC):
|
||||
raise sqlite3.DatabaseError("Expected DB schema v%s, DB schema is v%s" % (self.DB_SCHEMA, ver))
|
||||
logger.debug("DB_SCHEMA = %s", ver)
|
||||
|
||||
self._init_done = True
|
||||
return True
|
||||
|
||||
def create_schema(self, conn: sqlite3.Connection):
|
||||
@@ -369,9 +369,6 @@ class SQLiteProperties(SQLiteAppl):
|
||||
|
||||
"""
|
||||
|
||||
_locks: dict[str, threading.Lock] = {}
|
||||
_locks_lock = threading.Lock()
|
||||
|
||||
SQLITE_JOURNAL_MODE: str = "WAL"
|
||||
|
||||
DDL_PROPERTIES: str = """\
|
||||
@@ -409,16 +406,11 @@ CREATE TABLE IF NOT EXISTS properties (
|
||||
|
||||
if self._init_done:
|
||||
return False
|
||||
with self._locks_lock:
|
||||
db_lock = self._locks.setdefault(self.db_url, threading.Lock())
|
||||
with db_lock:
|
||||
if self._init_done:
|
||||
return False
|
||||
logger.debug("init properties of DB: %s", self.db_url)
|
||||
res = conn.execute(self.SQL_TABLE_EXISTS)
|
||||
if res.fetchone() is None: # DB schema needs to be be created
|
||||
self.create_schema(conn)
|
||||
self._init_done = True
|
||||
self._init_done = True
|
||||
logger.debug("init properties of DB: %s", self.db_url)
|
||||
res = conn.execute(self.SQL_TABLE_EXISTS)
|
||||
if res.fetchone() is None: # DB schema needs to be be created
|
||||
self.create_schema(conn)
|
||||
return True
|
||||
|
||||
def __call__(self, name: str, default: t.Any = None) -> t.Any:
|
||||
|
||||
Reference in New Issue
Block a user