Skip to content

Commit

Permalink
Merge branch 'main' into releases/8.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
craig8 authored Sep 22, 2021
2 parents 2d7f36b + a5640dd commit a91d9fc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion examples/GridAPPS-D/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
git+https://github.com/GRIDAPPSD/gridappsd-python.git@develop
stomp.py==6.0.0
PyYAML==5.3
PyYAML==5.4
pytz==2019.3
# psutil==5.4.7
dateutils==0.6.7
Expand Down
2 changes: 1 addition & 1 deletion examples/GridAPPS-DAgent/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
git+https://github.com/GRIDAPPSD/gridappsd-python.git@develop
stomp.py==6.0.0
PyYAML==5.3
PyYAML==5.4
pytz==2019.3
# psutil==5.4.7
dateutils==0.6.7
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@ def scrape_all(self):
self.max_per_request = max(int(self.register_count/self.register_count_divisor), 1)
_log.info("Device requires a lower max_per_request setting. Trying: "+str(self.max_per_request))
continue
elif e.message.endswith("rejected the request: 9") and self.use_read_multiple:
_log.info("Device rejected request with 'unrecognized-service' error, attempting to access with use_read_multiple false")
self.use_read_multiple = False
continue
else:
raise
except errors.Unreachable:
Expand Down

0 comments on commit a91d9fc

Please sign in to comment.