Skip to content

Commit

Permalink
Propoerty changed for ping_failures as it counts failures
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristianTremblay committed Sep 7, 2021
1 parent 9de2203 commit a09cc9c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
8 changes: 4 additions & 4 deletions BAC0/core/devices/Device.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def __init__(self):
self.auto_save = None
self.fast_polling = False
self.vendor_id = 0
self.ping_failed = 0
self.ping_failures = 0

def __repr__(self):
return "{}".format(self.asdict)
Expand Down Expand Up @@ -803,14 +803,14 @@ def update_description(self, value):
def ping(self):
try:
if self.read_property("objectName") == self.properties.name:
self.properties.ping_failed = 0
self.properties.ping_failures = 0
return True
else:
self.properties.ping_failed += 1
self.properties.ping_failures += 1
return False
except NoResponseFromController as e:
self._log_error("Error in ping : {}".format(e))
self.properties.ping_failed += 1
self.properties.ping_failures += 1
return False

def __repr__(self):
Expand Down
4 changes: 2 additions & 2 deletions BAC0/scripts/Lite.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ def ping_registered_devices(self):
)
)
each.ping()
if each.properties.ping_failed > 3:
if each.properties.ping_failures > 3:
raise NumerousPingFailures

except NumerousPingFailures:
Expand All @@ -339,7 +339,7 @@ def ping_registered_devices(self):
addr = each.properties.address
name = self.read("{} device {} objectName".format(addr, device_id))
if name == each.properties.name:
each.properties.ping_failed = 0
each.properties.ping_failures = 0
self._log.info(
"{}|{} is back online, reconnecting.".format(
each.properties.name, each.properties.address
Expand Down
8 changes: 5 additions & 3 deletions BAC0/tasks/Poll.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,11 @@ def device(self):

def task(self):
if self.device.properties.ping_failures > 0:
self.device._log.warning("Ping failed, skipping polling for now. Resending a ping to speed up things")
self.device.ping()
return
self.device._log.warning(
"Ping failed, skipping polling for now. Resending a ping to speed up things"
)
self.device.ping()
return
try:
if self.failures >= self.MAX_FAILURES:
raise MultiplePollingFailures(
Expand Down

0 comments on commit a09cc9c

Please sign in to comment.