Fix deadlock in delete_job by using unlocked save when lock is already held

pdf_renamer.py

@@ -68,23 +68,27 @@ JOBS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'jobs.json'
 job_queue = {}
 job_lock = threading.Lock()
 
-def save_jobs():
+def _save_jobs_unlocked():
-    """Save jobs to persistent storage"""
+    """Internal: Save jobs without acquiring lock (assumes lock is already held)"""
     try:
-        with job_lock:
+        # Convert datetime objects to strings for JSON serialization
-            # Convert datetime objects to strings for JSON serialization
+        jobs_to_save = {}
-            jobs_to_save = {}
+        for job_id, job in job_queue.items():
-            for job_id, job in job_queue.items():
+            jobs_to_save[job_id] = job.copy()
-                jobs_to_save[job_id] = job.copy()
+            # Convert any datetime objects if needed
-                # Convert any datetime objects if needed
+            if 'created_at' in jobs_to_save[job_id]:
-                if 'created_at' in jobs_to_save[job_id]:
+                jobs_to_save[job_id]['created_at'] = str(jobs_to_save[job_id]['created_at'])
-                    jobs_to_save[job_id]['created_at'] = str(jobs_to_save[job_id]['created_at'])
         
-            with open(JOBS_FILE, 'w') as f:
+        with open(JOBS_FILE, 'w') as f:
-                json.dump(jobs_to_save, f, indent=2)
+            json.dump(jobs_to_save, f, indent=2)
     except Exception as e:
         print(f"ERROR: Failed to save jobs: {e}")
 
+def save_jobs():
+    """Save jobs to persistent storage"""
+    with job_lock:
+        _save_jobs_unlocked()
+
 def load_jobs():
     """Load jobs from persistent storage"""
     global job_queue
@@ -144,7 +148,7 @@ def update_job_status(job_id, status, **kwargs):
             
             # Only save for important status changes
             if status in ['completed', 'error', 'processing']:
-                save_jobs()
+                _save_jobs_unlocked()  # Use unlocked version since we already hold the lock
 
 def cleanup_old_jobs():
     """Remove jobs older than JOB_RETENTION_DAYS"""
@@ -182,7 +186,7 @@ def cleanup_old_jobs():
             print(f"Cleaned up old job: {job_id}")
         
         if jobs_to_remove:
-            save_jobs()
+            _save_jobs_unlocked()  # Use unlocked version since we already hold the lock
             print(f"Removed {len(jobs_to_remove)} old jobs")
 
 def save_jobs_batched():
@@ -1495,7 +1499,7 @@ def delete_job(job_id):
                     print(f"DEBUG: Removing job from queue", file=sys.stderr, flush=True)
                     del job_queue[job_id]
                     print(f"DEBUG: Saving jobs to disk", file=sys.stderr, flush=True)
-                    save_jobs()  # Persist job deletion
+                    _save_jobs_unlocked()  # Use unlocked version since we already hold the lock
                     print(f"DEBUG: Job deletion complete", file=sys.stderr, flush=True)
                 else:
                     print(f"DEBUG: Job status is not completed: {job.get('status')}", file=sys.stderr, flush=True)