Merge pull request #250 from gnmerritt/trendlog-log-device-obj-prop-fix

ChristianTremblay · Feb 4, 2021 · d4e12e7 · d4e12e7
2 parents 75e1033 + bdc06d0
commit d4e12e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/BAC0/core/devices/Device.py b/BAC0/core/devices/Device.py
@@ -855,6 +855,7 @@ def connect(self, *, db=None):
                 self.new_state(RPDeviceConnected)
 
             except (NoResponseFromController, AttributeError) as error:
+                self._log.warning("Error connecting: %s", error)
                 if self.properties.db_name:
                     self.new_state(DeviceFromDB)
                 else:

diff --git a/BAC0/core/devices/mixins/read_mixin.py b/BAC0/core/devices/mixins/read_mixin.py
@@ -385,6 +385,8 @@ def _find_propid_index(key):
         for each in retrieve_type(objList, "trendLog"):
             point_address = str(each[1])
             tl = TrendLog(point_address, self, read_log_on_creation=False)
+            if tl.properties.log_device_object_property is None:
+                continue
             ldop_type, ldop_addr = (
                 tl.properties.log_device_object_property.objectIdentifier
             )