Merge branch 'master' of github.com:SebCOLLARD/Iot_Project_Epitech

Author: SebCOLLARD

DeviceManager/gui/run_gui.py

@@ -47,15 +47,12 @@ def __init__(self, args: list = None):
         self.temp_sensor_2 = TemperatureSensor(TEMP_2_TOKEN, self._sched)
         self.temp_sensor_3 = TemperatureSensor(TEMP_3_TOKEN, self._sched)
 
-    def exec(self):
-        """
-        Start the scheduler, execute the application and then join threads and shutdown the scheduler.
-        """
-
         self._sched.start()
 
-        super().exec()
-
+    def stop_all(self):
+        """
+        Stop all threads and shutdown the scheduler.
+        """
         self.light_1.stopThread()
         self.light_2.stopThread()
         self.light_3.stopThread()
@@ -114,4 +111,6 @@ def run_gui(args: list = None):
 
     # EXEC APP
     # ///////////////////////////////////////////////////////////////
-    sys.exit(app.exec())
+    app.exec()
+    app.stop_all()
+    sys.exit(0)

DeviceManager/light_mqtt.py

@@ -4,9 +4,8 @@
 import threading
 
 import paho.mqtt.client as mqtt
-from apscheduler.schedulers import SchedulerAlreadyRunningError
-from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.triggers.interval import IntervalTrigger
+from apscheduler.schedulers.background import BackgroundScheduler
 
 from .devices import LightSensor
 from .config import THINGSBOARD_URL
@@ -35,19 +34,16 @@ def __init__(self, topicSend, topicRecived, access_token):
         self.topicRecived = topicRecived
         self.accessToken = access_token
         self.scheduler: BackgroundScheduler = BackgroundScheduler()
+        self.job = self.scheduler.add_job(
+            self.send, trigger=IntervalTrigger(seconds=LightMqtt._socketTimes)
+        )
         self.light = LightSensor()
         self.client = mqtt.Client()
         self.client.username_pw_set(username=self.accessToken)
         self.thread = threading.Thread(target=self.start)
+        self.scheduler.start()
         self.thread.start()
 
-    def __del__(self):
-        """
-        Stop the thread.
-        """
-        print("\n\n\n\nIN DEL\n\n\n\n")
-        self.stopThread()
-
     def send(self):
         """
         Using MQTT send data on topicSend and telemetry topic.
@@ -96,19 +92,12 @@ def start(self):
         self.client.connect(LightMqtt._ip, LightMqtt._port, 60)
         self.client.subscribe(self.topicRecived)
         self.client.on_message = self.receiver()
-        self.job = self.scheduler.add_job(
-            self.send, trigger=IntervalTrigger(seconds=LightMqtt._socketTimes)
-        )
-        try:
-            self.scheduler.start()
-        except SchedulerAlreadyRunningError:
-            pass
         self.client.loop_forever()
 
     def stopThread(self):
         """
         Stop all background processes.
         """
-        self.scheduler.remove_all_jobs()
+        self.scheduler.shutdown(wait=True)
         self.client.disconnect()
         self.thread.join()

DeviceManager/protocols/coap.py

@@ -34,7 +34,9 @@ def get(self, route, callback=None, timeout=None) -> Message:
 
         Returns a `Message` instance containing the response.
         """
-        return self._client.get(route, callback=callback, timeout=timeout)
+        res = self._client.get(route, callback=callback, timeout=timeout)
+        self._client.stop()
+        return res
 
     def put(self, route, payload, callback=None, timeout=None) -> Message:
         """
@@ -48,9 +50,11 @@ def put(self, route, payload, callback=None, timeout=None) -> Message:
 
         Returns a `Message` instance containing the response.
         """
-        return self._client.put(
+        res = self._client.put(
             route, payload, callback=callback, timeout=timeout, **self._ct
         )
+        self._client.stop()
+        return res
 
     def post(self, access_token, payload, callback=None, timeout=None) -> Message:
         """
@@ -64,13 +68,15 @@ def post(self, access_token, payload, callback=None, timeout=None) -> Message:
 
         Returns a `Message` instance containing the response.
         """
-        return self._client.post(
+        res = self._client.post(
             self.route_post.format(access_token=access_token),
             payload,
             callback=callback,
             timeout=timeout,
             **self._ct
         )
+        self._client.stop()
+        return res
 
     def delete(self, route, payload, callback=None, timeout=None) -> Message:
         """
@@ -84,6 +90,8 @@ def delete(self, route, payload, callback=None, timeout=None) -> Message:
 
         Returns a `Message` instance containing the response.
         """
-        return self._client.delete(
+        res = self._client.delete(
             route, payload, callback=callback, timeout=timeout, **self._ct
         )
+        self._client.stop()
+        return res