Fixes new process recovery service not being executable & removed duplicate functionality in it for removing leftover lock files

Author: crocodilestick

CONTRIBUTORS

@@ -1,7 +1,7 @@
 CONTRIBUTORS
 
 This file is automatically generated. DO NOT EDIT MANUALLY.
-Generated on: 2025-09-23T09:50:10.069578Z
+Generated on: 2025-09-23T10:56:33.176668Z
 
 Upstream project: https://github.com/janeczku/calibre-web
 Fork project (Calibre-Web Automated, since 2024): https://github.com/crocodilestick/calibre-web-automated

root/etc/s6-overlay/s6-rc.d/cwa-process-recovery/run

@@ -34,49 +34,6 @@ safe_kill_process() {
     fi
 }
 
-# Clean up stale lock files and associated processes
-cleanup_stale_locks() {
-    echo "[cwa-process-recovery] Checking for stale lock files and processes..."
-    
-    local lock_files=(
-        "/tmp/ingest_processor.lock"
-        "/tmp/convert_library.lock" 
-        "/tmp/cover_enforcer.lock"
-        "/tmp/kindle_epub_fixer.lock"
-    )
-    
-    local cleaned_count=0
-    
-    for lock_file in "${lock_files[@]}"; do
-        if [ -f "$lock_file" ]; then
-            local lock_name=$(basename "$lock_file" .lock)
-            echo "[cwa-process-recovery] Found stale lock file: $lock_file"
-            
-            # Try to read PID from lock file
-            local pid=""
-            if [ -r "$lock_file" ]; then
-                pid=$(cat "$lock_file" 2>/dev/null | head -1 | tr -d '\n' | grep -E '^[0-9]+$' || true)
-            fi
-            
-            if [ -n "$pid" ]; then
-                # Kill the process if it's still running
-                safe_kill_process "$pid" "$lock_name"
-            fi
-            
-            # Remove the lock file
-            rm -f "$lock_file"
-            echo "[cwa-process-recovery] Removed stale lock file: $lock_file"
-            ((cleaned_count++))
-        fi
-    done
-    
-    if [ $cleaned_count -eq 0 ]; then
-        echo "[cwa-process-recovery] No stale lock files found"
-    else
-        echo "[cwa-process-recovery] Cleaned up $cleaned_count stale lock file(s)"
-    fi
-}
-
 # Clean up stale temporary processing files
 cleanup_temp_files() {
     echo "[cwa-process-recovery] Cleaning up stale temporary files..."
@@ -178,7 +135,6 @@ cleanup_orphaned_processes() {
 # Main recovery sequence
 echo "[cwa-process-recovery] ========== Starting Recovery Sequence =========="
 
-cleanup_stale_locks
 cleanup_temp_files  
 reset_processing_status
 cleanup_orphaned_processes

root/etc/s6-overlay/s6-rc.d/cwa-process-recovery/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/cwa-process-recovery/run

scripts/setup-cwa.sh

@@ -15,6 +15,7 @@ change_script_permissions () {
     chmod +x /etc/s6-overlay/s6-rc.d/cwa-auto-zipper/run
     chmod +x /etc/s6-overlay/s6-rc.d/cwa-ingest-service/run
     chmod +x /etc/s6-overlay/s6-rc.d/cwa-init/run
+    chmod +x /etc/s6-overlay/s6-rc.d/cwa-process-recovery/run
     chmod +x /etc/s6-overlay/s6-rc.d/metadata-change-detector/run
     chmod +x /etc/s6-overlay/s6-rc.d/calibre-binaries-setup/run
     chmod +x /etc/s6-overlay/s6-rc.d/svc-calibre-web-automated/run