From 5bc731993375981bc9127241637b7c37f812d06c Mon Sep 17 00:00:00 2001
From: Fabio Manganiello <blacklight86@gmail.com>
Date: Tue, 17 Jul 2018 23:47:13 +0200
Subject: [PATCH] Optimized serial plugin

---
 platypush/backend/sensor/__init__.py |  5 -----
 platypush/plugins/serial/__init__.py | 30 +++++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/platypush/backend/sensor/__init__.py b/platypush/backend/sensor/__init__.py
index 4b272e997a..08e8831783 100644
--- a/platypush/backend/sensor/__init__.py
+++ b/platypush/backend/sensor/__init__.py
@@ -64,11 +64,6 @@ class SensorBackend(Backend):
                         elif new_data[measure] < threshold and (self.data is None or (
                                 measure in self.data and self.data[measure] >= threshold)):
                             data_below_threshold[measure] = new_data[measure]
-                else:
-                    if new_data > threshold and (self.data is None or self.data <= threshold):
-                        data_above_threshold = new_data
-                    elif new_data < threshold and (self.data is None or self.data >= threshold):
-                        data_below_threshold = new_data
 
             if data_below_threshold:
                 self.bus.post(SensorDataBelowThresholdEvent(data=data_below_threshold))
diff --git a/platypush/plugins/serial/__init__.py b/platypush/plugins/serial/__init__.py
index 0652089402..0a9c964427 100644
--- a/platypush/plugins/serial/__init__.py
+++ b/platypush/plugins/serial/__init__.py
@@ -28,6 +28,7 @@ class SerialPlugin(GpioSensorPlugin):
 
         self.device = device
         self.baud_rate = baud_rate
+        self.serial = None
 
 
     def _read_json(self, serial_port):
@@ -59,18 +60,37 @@ class SerialPlugin(GpioSensorPlugin):
 
         return output.decode().strip()
 
+    def _get_serial(self, reset=False):
+        if self.serial:
+            if not reset:
+                return self.serial
+
+            self._close_serial()
+
+        self.serial = serial.Serial(self.device, self.baud_rate)
+        return self.serial
+
+    def _close_serial(self):
+        if self.serial:
+            try:
+                self.serial.close()
+                self.serial = None
+            except Exception as e:
+                self.logger.warning('Error while closing serial communication: {}')
+                self.logger.exception(e)
+
     @action
     def get_measurement(self):
         """
         Reads JSON data from the serial device and returns it as a message
         """
 
-        ser = serial.Serial(self.device, self.baud_rate)
-
         try:
-            data = self._read_json(ser)
-        finally:
-            ser.close()
+            ser = self._get_serial()
+        except:
+            ser = self._get_serial(reset=True)
+
+        data = self._read_json(ser)
 
         try:
             data = json.loads(data)