Revize 76b68bb9

re #9359 Added diskcache dependency, prepared a new thread for periodical data retrieval from the cache

client/api_client.py

@@ -1 +1 @@
 import json
 import requests
 import logging
-
+from time import sleep
+from diskcache import Deque
 from requests import HTTPError, ConnectionError
 
-from config_manager import server_url, server_port, server_endpoint
+from config_manager import server_url, server_port, server_endpoint, cache_dir, cache_retry_period_seconds, cache_max_retries, cache_max_entries
 
 
+_cache = Deque(directory=cache_dir)
 _uri = server_url + ":" + server_port + server_endpoint
 
 
@@ -19 +21 @@
         logging.warning(f"sending payload = {payload} to {_uri} failed")
     except HTTPError as error:
         logging.error(f"HTTP Error ({_uri}) payload = {payload}, {error}")
+
+
+def api_client_run():
+    while True:
+        sleep(cache_retry_period_seconds)

client/config.ini

@@ -10 +10 @@
 [logger]
 format = %(asctime)s %(levelname)s : %(message)s
 level = INFO
+
+[cache]
+directory = data
+max_entries = 100
+max_retries = 20
+retry_period_seconds = 20

client/config_manager.py

@@ -32 +32 @@
     logger_level = 40
 elif logger_level_str == "CRITICAL":
     logger_level = 50
+
+cache_dir = config[cache_section]["directory"]
+cache_max_entries = int(config[cache_section]["max_entries"])
+cache_max_retries = int(config[cache_section]["max_retries"])
+cache_retry_period_seconds = float(config[cache_section]["retry_period_seconds"])

client/main.py

@@ -6 +6 @@
 from config_manager import logger_format, logger_level
 from usb_detector.detector import register_listener, usb_detector_run
 from usb_detector.event_listener import usb_connected_callback, usb_disconnected_callback
+from api_client import api_client_run
 
 
 if __name__ == "__main__":
@@ -18 +19 @@
 
     usb_detector_thread = Thread(target=usb_detector_run)
     usb_detector_thread.setDaemon(True)
+
+    api_thread = Thread(target=api_client_run)
+    api_thread.setDaemon(True)
+
     usb_detector_thread.start()
+    api_thread.start()
 
     usb_detector_thread.join()
+    api_thread.join()

client/requirements.txt

@@ +1 @@
+diskcache==5.4.0
 pyusb==1.2.1
 requests==2.25.1
 tendo==0.2.15

client/usb_detector/detector.py

@@ -40 +40 @@
 def usb_detector_run():
     logging.info("USB device detector is now running")
 
-    if not os.path.exists(connected_devices_filename):
-        dir_name = os.path.dirname(connected_devices_filename)
-        os.makedirs(dir_name)
-
     while True:
         last_connected_devices = _load_last_connected_devices()
         detected_devices = read_connected_devices()