[fetch] ferme la connection modbus dans fetch

pyheatpump/cli.py

@@ -60,91 +60,98 @@ def fetch(type):
 
     from pyheatpump import modbus
 
-    if type is None:
-        var_types = VariableType.getall()
-    else:
-        var_types = {}
-        for label, var_type in VariableType.getall().items():
-            if label in type or var_type.slabel in type:
-                var_types[label] = var_type
-
-    # Analog - float
-    if 'Analog' in var_types.keys():
-        analog = var_types['Analog']
-        logger.info('Read analog variables in registers [{}, {}]'.format(
-            analog.start_address, analog.end_address
-        ))
-        res = modbus.read_holding_registers(analog.start_address, analog.end_address)
-
-        logger.debug(f'analog length : {len(res)}')
-        for r in range(len(res)):
-            var = Variable(**{
-                'type': analog,
-                'address': r + analog.start_address})
-
-            if not var.exists():
-                logger.info('Insert variable {}:{}'.format(
-                    var.type, var.address))
-                var.insert()
-
-            val = VariableValue(**{
-                'type': var.type,
-                'address': var.address,
-                'value': res[r]})
-            val.insert()
-
-
-    # Integer - int
-    if 'Integer' in var_types.keys():
-        integer = var_types['Integer']
-        logger.info('Read integer variables in registers [{}, {}]'.format(
-            integer.start_address, integer.end_address
-        ))
-        res = modbus.read_holding_registers(integer.start_address, integer.end_address)
-
-        logger.debug(f'integer length : {len(res)}')
-        for r in range(len(res)):
-            var = Variable(**{
-                'type': integer,
-                'address': r + integer.start_address})
-
-            if not var.exists():
-                logger.info('Insert variable {}:{}'.format(
-                    var.type, var.address))
-                var.insert()
-
-            val = VariableValue(**{
-                'type': var.type,
-                'address': var.address,
-                'value': res[r]})
-            val.insert()
-
-    # Digital - bool
-    if 'Digital' in var_types.keys():
-        digital = var_types['Digital']
-        logger.info('Read digital variables in coils [{}, {}]'.format(
-            digital.start_address, digital.end_address
-        ))
-        res = modbus.read_coils(digital.start_address, digital.end_address)
-
-        logger.debug(f'digital length : {len(res)}')
-        for r in range(len(res)):
-            var = Variable(**{
-                'type': digital,
-                'address': r + digital.start_address})
-
-            if not var.exists():
-                logger.info('Insert variable {}:{}'.format(
-                    var.type, var.address))
-                var.insert()
-
-            val = VariableValue(**{
-                'type': var.type,
-                'address': var.address,
-                'value': res[r]})
-            val.insert()
-
-    logger.info('Successfully read all variables')
+    try:
+        if type is None:
+            var_types = VariableType.getall()
+        else:
+            var_types = {}
+            for label, var_type in VariableType.getall().items():
+                if label in type or var_type.slabel in type:
+                    var_types[label] = var_type
+
+        # Analog - float
+        if 'Analog' in var_types.keys():
+            analog = var_types['Analog']
+            logger.info('Read analog variables in registers [{}, {}]'.format(
+                analog.start_address, analog.end_address
+            ))
+            res = modbus.read_holding_registers(analog.start_address, analog.end_address)
+
+            logger.debug(f'analog length : {len(res)}')
+            for r in range(len(res)):
+                var = Variable(**{
+                    'type': analog,
+                    'address': r + analog.start_address})
+
+                if not var.exists():
+                    logger.info('Insert variable {}:{}'.format(
+                        var.type, var.address))
+                    var.insert()
+
+                val = VariableValue(**{
+                    'type': var.type,
+                    'address': var.address,
+                    'value': res[r]})
+                val.insert()
+
+
+        # Integer - int
+        if 'Integer' in var_types.keys():
+            integer = var_types['Integer']
+            logger.info('Read integer variables in registers [{}, {}]'.format(
+                integer.start_address, integer.end_address
+            ))
+            res = modbus.read_holding_registers(integer.start_address, integer.end_address)
+
+            logger.debug(f'integer length : {len(res)}')
+            for r in range(len(res)):
+                var = Variable(**{
+                    'type': integer,
+                    'address': r + integer.start_address})
+
+                if not var.exists():
+                    logger.info('Insert variable {}:{}'.format(
+                        var.type, var.address))
+                    var.insert()
+
+                val = VariableValue(**{
+                    'type': var.type,
+                    'address': var.address,
+                    'value': res[r]})
+                val.insert()
+
+        # Digital - bool
+        if 'Digital' in var_types.keys():
+            digital = var_types['Digital']
+            logger.info('Read digital variables in coils [{}, {}]'.format(
+                digital.start_address, digital.end_address
+            ))
+            res = modbus.read_coils(digital.start_address, digital.end_address)
+
+            logger.debug(f'digital length : {len(res)}')
+            for r in range(len(res)):
+                var = Variable(**{
+                    'type': digital,
+                    'address': r + digital.start_address})
+
+                if not var.exists():
+                    logger.info('Insert variable {}:{}'.format(
+                        var.type, var.address))
+                    var.insert()
+
+                val = VariableValue(**{
+                    'type': var.type,
+                    'address': var.address,
+                    'value': res[r]})
+                val.insert()
+
+        logger.info('Successfully read all variables')
+    except Exception as exc:
+        logger.error(exc)
+
+    if modbus.serial_conn:
+        modbus.serial_conn.close()
+
 
 
 @click.option('--since', is_flag=True)