fix: do not use unreliable tempfile.TemporaryDirectory

DCOR-dev · Apr 17, 2024 · 6b667b7 · 6b667b7
1 parent 9b04758
commit 6b667b7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+0.15.3
+ - fix: do not use unreliable tempfile.TemporaryDirectory
 0.15.2
  - fix: attempt to create temporary condense location if not exists
 0.15.1

diff --git a/ckanext/dc_serve/jobs.py b/ckanext/dc_serve/jobs.py
@@ -39,8 +39,13 @@ def generate_condensed_resource_job(resource, override=False):
             except BaseException:
                 cache_loc = None
 
-        with tempfile.TemporaryDirectory(dir=cache_loc) as ttd_name:
-            path_cond = pathlib.Path(ttd_name) / "condensed.rtdc"
+        if cache_loc is None:
+            cache_loc = tempfile.mkdtemp(prefix="ckanext-dc_serve_")
+
+        cache_loc = pathlib.Path(cache_loc)
+        path_cond = cache_loc / f"{rid}_condensed.rtdc"
+
+        try:
             with CKANResourceFileLock(
                     resource_id=rid,
                     locker_id="DCOR_generate_condensed") as fl:
@@ -121,4 +126,8 @@ def generate_condensed_resource_job(resource, override=False):
                                          artifact="condensed",
                                          override=True)
                     return True
+        except BaseException:
+            pass
+        finally:
+            path_cond.unlink(missing_ok=True)
     return False