Give threads less time to shut down gracefully. Attempt shutdown() rather than stop() on the telnet connections to see if that improves things

providers/solarconditions/giroionosonde.py

@@ -73,7 +73,7 @@ class GIROIonosonde(SolarConditionsProvider):
     def stop(self):
         self._stop_event.set()
         if self._thread:
-            self._thread.join(timeout=35)
+            self._thread.join(timeout=12)
             if self._thread.is_alive():
                 logger.warning("GIRO ionosonde worker thread did not exit on time and will be killed.")
 

providers/solarconditions/http_solar_conditions_provider.py

@@ -31,7 +31,7 @@ class HTTPSolarConditionsProvider(SolarConditionsProvider):
     def stop(self):
         self._stop_event.set()
         if self._thread:
-            self._thread.join(timeout=35)
+            self._thread.join(timeout=12)
             if self._thread.is_alive():
                 logger.warning(f"{self.name} solar conditions worker thread did not exit on time and will be killed.")
 

providers/solarconditions/kc2gprop.py

@@ -38,7 +38,7 @@ class KC2GProp(SolarConditionsProvider):
     def stop(self):
         self._stop_event.set()
         if self._thread:
-            self._thread.join(timeout=35)
+            self._thread.join(timeout=12)
             if self._thread.is_alive():
                 logger.warning("KC2G ionosonde worker thread did not exit on time and will be killed.")