From 200ea9380f82cb5e29e08879c9ca078fef35d331 Mon Sep 17 00:00:00 2001
From: Bastien Abadie <bastien@nextcairn.com>
Date: Tue, 23 Mar 2021 21:38:01 +0100
Subject: [PATCH] Do not store use_cache
---
arkindex_worker/worker.py | 9 +++++----
tests/test_base_worker.py | 3 +--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arkindex_worker/worker.py b/arkindex_worker/worker.py
index 839ee99f..ec61b14b 100644
--- a/arkindex_worker/worker.py
+++ b/arkindex_worker/worker.py
@@ -50,9 +50,7 @@ class BaseWorker(object):
logger.info(f"Worker will use {self.work_dir} as working directory")
- self.use_cache = use_cache
-
- if self.use_cache:
+ if use_cache is True:
if os.environ.get("TASK_ID") and os.path.isdir(CACHE_DIR):
cache_path = os.path.join(CACHE_DIR, "db.sqlite")
else:
@@ -60,6 +58,9 @@ class BaseWorker(object):
self.cache = LocalDB(cache_path)
self.cache.create_tables()
+ else:
+ self.cache = None
+ logger.debug("Cache is disabled")
@property
def is_read_only(self):
@@ -466,7 +467,7 @@ class ElementsWorker(BaseWorker):
for element in elements:
self.report.add_element(parent.id, element["type"])
- if self.use_cache:
+ if self.cache:
# Store elements in local cache
try:
parent_id_hex = convert_str_uuid_to_hex(parent.id)
diff --git a/tests/test_base_worker.py b/tests/test_base_worker.py
index 72a0590c..47a7bef9 100644
--- a/tests/test_base_worker.py
+++ b/tests/test_base_worker.py
@@ -33,8 +33,7 @@ def test_init_with_local_cache(monkeypatch):
assert worker.work_dir == os.path.expanduser("~/.local/share/arkindex")
assert worker.worker_version_id == "12341234-1234-1234-1234-123412341234"
- assert worker.use_cache
- assert worker.cache
+ assert worker.cache is not None
def test_init_var_ponos_data_given(monkeypatch):
--
GitLab