Changed server url to websocket server url

worker/settings.py

@@ -13,14 +13,14 @@ class SettingsManager:
     REQUIRED_SETTINGS = [
         "WORKER_ID",
         "WORKER_SECRET",
-        "SERVER_URL",
+        "WEBSOCKET_SERVER_URL",
         "API_BASE_URL",
         # Add other essential settings keys here
     ]
 
     # Define settings that can optionally come from CLI args, mapping arg name to setting key
     CLI_OVERRIDABLE_SETTINGS = {
-        "server_url": "SERVER_URL",
+        "websocket_server_url": "WEBSOCKET_SERVER_URL",
         "api_base_url": "API_BASE_URL",
         "region_id": "REGION_ID", # Needed for enrollment if not in env/file
         "region_enrollment_key": "REGION_ENROLLMENT_KEY" # Needed for enrollment if not in env/file

worker/worker.py

@@ -15,7 +15,7 @@ class WorkerClient:
         try:
             self.worker_id = settings.get_value("WORKER_ID")
             self.worker_secret = settings.get_value("WORKER_SECRET")
-            self.server_url = settings.get_value("SERVER_URL")
+            self.server_url = settings.get_value("WEBSOCKET_SERVER_URL")
             self.debug_socketio = settings.get_value("DEBUG_SOCKETIO", False) # Get debug flag
             # Libvirt config is now also potentially in settings, or keep defaults here
             self.libvirt_config = {

worker2.py

@@ -186,7 +186,7 @@ def main():
     # Parse command line arguments - these can override settings
     parser = argparse.ArgumentParser(description="Worker CLI with Docker and Libvirt monitoring")
     # Add arguments that correspond to settings keys in SettingsManager.CLI_OVERRIDABLE_SETTINGS
-    parser.add_argument("--server-url", help="WebSocket Server URL (overrides SERVER_URL setting)")
+    parser.add_argument("--websocket-server-url", help="WebSocket Server URL (overrides WEBSOCKET_SERVER_URL setting)")
     parser.add_argument("--region-id", help="Region ID (overrides REGION_ID setting, needed for enrollment)")
     parser.add_argument("--api-base-url", help="Base URL for API (overrides API_BASE_URL setting)")
     parser.add_argument("--region-enrollment-key", help="Region Enrollment Key (overrides REGION_ENROLLMENT_KEY setting)")
@@ -246,7 +246,7 @@ def main():
 
     # Final validation of essential settings before starting worker/monitors
     try:
-        settings.validate_settings(["WORKER_ID", "WORKER_SECRET", "SERVER_URL"])
+        settings.validate_settings(["WORKER_ID", "WORKER_SECRET", "WEBSOCKET_SERVER_URL"])
     except ValueError as e:
         logger.error(f"Cannot start worker: {e}")
         exit(1)