Version [1.0.1]

Author: I-am-PUID-0

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+## Version [1.0.1] - 2024-16-07
+
+### Fixed
+
+- DMB: Introduced a Riven startup check for the symlinked directory to ensure the Zurg startup processes have finished before starting Riven
+- DMB: Introduced a Rclone startup check for the Zurg WebDAV URL to ensure the Zurg startup processes have finished before starting Rclone
+
+
 ## Version [1.0.0] - 2024-25-06
 
 ### Breaking Changes

README.md

@@ -83,6 +83,7 @@ services:
       ## Riven Required Settings
       - RIVEN_ENABLED=true
       - ORIGIN=http://0.0.0.0:3000 # See Riven documentation for more details
+      - BACKEND_URL=http://127.0.0.1:8080 # Required to be left as is
       ## Riven Optional Settings
      # - PLEX_TOKEN=
      # - PLEX_ADDRESS=

healthcheck.py

@@ -29,32 +29,32 @@ def check_processes(process_info):
         "zurg_rd": {
             "regex": re.compile(rf'/zurg/RD/zurg.*--preload', re.IGNORECASE),
             "error_message": "The Zurg RD process is not running.",
-            "should_run": str(ZURG).lower() == 'true' and RDAPIKEY
+            "should_run": str(ZURG).lower() == 'true' and RDAPIKEY 
         },
         "zurg_ad": {
             "regex": re.compile(rf'/zurg/AD/zurg.*--preload', re.IGNORECASE),
             "error_message": "The Zurg AD process is not running.",
-            "should_run": str(ZURG).lower() == 'true' and ADAPIKEY
+            "should_run": str(ZURG).lower() == 'true' and ADAPIKEY 
         },
         "riven_frontend": {
             "regex": re.compile(r'node build'),
             "error_message": "The Riven frontend process is not running.",
-            "should_run": str(RIVEN).lower() == 'true'
+            "should_run": str(RIVEN).lower() == 'true' and os.path.exists(f'/data/{RCLONEMN}/__all__')
         },
         "riven_backend": {
             "regex": re.compile(r'/venv/bin/python backend/main.py'),
             "error_message": "The Riven backend process is not running.",
-            "should_run": str(RIVEN).lower() == 'true'
+            "should_run": str(RIVEN).lower() == 'true' and os.path.exists(f'/data/{RCLONEMN}/__all__')
         },
         "rclonemn_rd": {
             "regex": re.compile(rf'rclone {mount_type} {re.escape(RCLONEMN_RD)}:'),
             "error_message": f"The Rclone RD process for {RCLONEMN_RD} is not running.",
-            "should_run": str(ZURG).lower() == 'true' and RDAPIKEY
+            "should_run": str(ZURG).lower() == 'true' and RDAPIKEY and os.path.exists(f'/healthcheck/{RCLONEMN}')
         },
         "rclonemn_ad": {
             "regex": re.compile(rf'rclone {mount_type} {re.escape(RCLONEMN_AD)}:'),
             "error_message": f"The Rclone AD process for {RCLONEMN_AD} is not running.",
-            "should_run": str(ZURG).lower() == 'true' and ADAPIKEY
+            "should_run": str(ZURG).lower() == 'true' and ADAPIKEY and os.path.exists(f'/healthcheck/{RCLONEMN}')
         }
     }
 

main.py

@@ -9,7 +9,7 @@
 def main():
     logger = get_logger()
 
-    version = '1.0.0'
+    version = '1.0.1'
 
     ascii_art = f'''
                                                                        

rclone/rclone.py

@@ -11,20 +11,37 @@ def get_port_from_config(config_file_path, key_type):
                     return port
     except Exception as e:
         logger.error(f"Error reading port from config file: {e}")
-    return '9999'  
+    return '9999'
 
 def obscure_password(password):
     """Obscure the password using rclone."""
     try:
         result = subprocess.run(["rclone", "obscure", password], check=True, stdout=subprocess.PIPE)
         return result.stdout.decode().strip()
     except subprocess.CalledProcessError as e:
-        print("Error obscuring password:", e)
+        logger.error(f"Error obscuring password: {e}")
         return None
 
+def wait_for_url(url, endpoint="/dav/", timeout=600):
+    start_time = time.time()
+    logger.info(f"Waiting to start the rclone process until the Zurg WebDAV {url}{endpoint} is accessible.")    
+    while time.time() - start_time < timeout:
+        try:
+            response = requests.get(f"{url}{endpoint}")
+            if response.status_code == 207:
+                logger.debug(f"Zurg WebDAV {url}{endpoint} is accessible.")
+                return True
+            else:
+                logger.debug(f"Received status code {response.status_code} while waiting for {url}{endpoint} to be accessible.")
+        except requests.ConnectionError as e:
+            logger.debug(f"Connection error while waiting for the Zurg WebDAV {url}{endpoint} to be accessible: {e}")
+        time.sleep(5)
+    logger.error(f"Timeout: Zurg WebDAV {url}{endpoint} is not accessible after {timeout} seconds.")
+    return False
+
 def setup():
     logger.info("Checking rclone flags")
- 
+
     try:
         if not RCLONEMN:
             raise Exception("Please set a name for the rclone mount")
@@ -84,28 +101,36 @@ def setup():
             logger.info(f"Configuring rclone for {mn}")
             subprocess.run(["umount", f"/data/{mn}"], check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
             os.makedirs(f"/data/{mn}", exist_ok=True)
+
             if NFSMOUNT is not None and NFSMOUNT.lower() == "true":
                 if NFSPORT:
-                    port = NFSPORT                    
+                    port = NFSPORT
                     logger.info(f"Setting up rclone NFS mount server for {mn} at 0.0.0.0:{port}")
                     rclone_command = ["rclone", "serve", "nfs", f"{mn}:", "--config", "/config/rclone.config", "--addr", f"0.0.0.0:{port}", "--vfs-cache-mode=full", "--dir-cache-time=10"]
-                else: 
-                    port = random.randint(8001, 8999)                    
+                else:
+                    port = random.randint(8001, 8999)
                     logger.info(f"Setting up rclone NFS mount server for {mn} at 0.0.0.0:{port}")
-                    rclone_command = ["rclone", "serve", "nfs", f"{mn}:", "--config", "/config/rclone.config", "--addr", f"0.0.0.0:{port}", "--vfs-cache-mode=full", "--dir-cache-time=10"]                    
+                    rclone_command = ["rclone", "serve", "nfs", f"{mn}:", "--config", "/config/rclone.config", "--addr", f"0.0.0.0:{port}", "--vfs-cache-mode=full", "--dir-cache-time=10"]
             else:
                 rclone_command = ["rclone", "mount", f"{mn}:", f"/data/{mn}", "--config", "/config/rclone.config", "--allow-other", "--poll-interval=0", "--dir-cache-time=10"]
             if not RIVEN or idx != len(mount_names) - 1:
                 rclone_command.append("--daemon")
-    
-            logger.info(f"Starting rclone{' daemon' if '--daemon' in rclone_command else ''} for {mn}")
-            process_name = "rclone"
-            subprocess_logger = SubprocessLogger(logger, process_name)
-            process = subprocess.Popen(rclone_command, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE)
-            subprocess_logger.start_monitoring_stderr(process, mn, process_name)
+
+            url = f"http://localhost:{rd_port if mn == RCLONEMN_RD else ad_port}"
+            if os.path.exists(f"/healthcheck/{mn}"):
+                os.rmdir(f"/healthcheck/{mn}")
+            if wait_for_url(url):
+                os.makedirs(f"/healthcheck/{mn}") # makdir for healthcheck. Don't like it, but it works for now...
+                logger.info(f"The Zurg WebDAV URL {url}/dav is accessible. Starting rclone{' daemon' if '--daemon' in rclone_command else ''} for {mn}")
+                process_name = "rclone"
+                subprocess_logger = SubprocessLogger(logger, process_name)
+                process = subprocess.Popen(rclone_command, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE)
+                subprocess_logger.start_monitoring_stderr(process, mn, process_name)
+            else:
+                logger.error(f"The Zurg WebDav URL {url}/dav is not accessible within the timeout period. Skipping rclone setup for {mn}")
 
         logger.info("rclone startup complete")
 
     except Exception as e:
         logger.error(e)
-        exit(1)
+        exit(1)

riven_/update.py

@@ -8,6 +8,10 @@ def __init__(self):
         self.backend_process = None
 
     def start_process(self, process_name, config_dir=None):
+        directory = f"/data/{RCLONEMN}/__all__"         
+        while not os.path.exists(directory):
+            self.logger.info(f"Waiting for symlink directory {directory} to become available before starting Riven")
+            time.sleep(10)       
         if process_name == 'Riven_frontend':
             command = ["node", "build"]
             config_dir = "./riven/frontend"

zurg/setup.py

@@ -120,7 +120,8 @@ def setup_zurg_instance(config_dir, token, key_type):
             else:    
                 port = random.randint(9001, 9999)
                 logger.debug(f"Selected port {port} for Zurg w/ {key_type} instance")
-                update_port(config_file_path, port)       
+                update_port(config_file_path, port)
+                
 
             if ZURGUSER and ZURGPASS:
                 update_creds(config_file_path, ZURGUSER, ZURGPASS)