Exit cleanly when no WiFi devices are available

maggie44 · maggie44 · commit 007f22da9ec3 · 2023-01-17T16:17:28.000Z
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
       context: .
       dockerfile: Dockerfile
     network_mode: "host"
-    restart: always
+    restart: on-failure
     volumes:
       - "py_wifi_connect_db:/app/db" # Optional if not setting the hotspot ssid and password via the API
     labels:
diff --git a/src/common/errors.py b/src/common/errors.py
@@ -46,10 +46,6 @@ class WifiNetworkManagerError(Exception):
     pass
 
 
-class WifiNoSuitableDevice(Exception):
-    pass
-
-
 # Custom error messages for Flask-RESTful to return
 errors = {
     "WifiConnectionFailed": {
@@ -72,8 +68,4 @@ class WifiNoSuitableDevice(Exception):
         "message": "Failed communicating with Network Manager.",
         "status": 500,
     },
-    "WifiNoSuitableDevice": {
-        "message": "No suitable Wi-Fi device available.",
-        "status": 404,
-    },
 }
diff --git a/src/common/wifi.py b/src/common/wifi.py
@@ -3,13 +3,13 @@
 import os
 import socket
 import subprocess
+import sys
 import time
 from common.errors import logger
 from common.errors import WifiConnectionFailed
 from common.errors import WifiDeviceNotFound
 from common.errors import WifiHotspotStartFailed
 from common.errors import WifiNetworkManagerError
-from common.errors import WifiNoSuitableDevice
 from common.nm_dicts import get_nm_dict
 from common.system import led
 from time import sleep
@@ -251,8 +251,8 @@ def get_device():
     if Pnm.NM_DEVICE_TYPE_WIFI in devices:
         return devices[Pnm.NM_DEVICE_TYPE_WIFI]
     else:
-        logger.error("No suitable or available device found.")
-        raise WifiNoSuitableDevice
+        logger.error("No suitable or available device found. Exiting.")
+        sys.exit(0)
 
 
 def list_access_points():
