Skip to content

Commit

Permalink
Add fallback exception handler for http probe
Browse files Browse the repository at this point in the history
  • Loading branch information
SvenVD committed Apr 27, 2020
1 parent ff59eb7 commit 60c87a8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# rpisurv 2 release notes
## Changes in 2.1.7
Http probe did not handle all exceptions which could crash rpisurv on rare occasions like described in the [link](https://www.tapatalk.com/groups/rpisurv/viewtopic.php?p=339#p339).
Fixed by inserting a fallback exception handler in the http probe logic.

## Changes in 2.1.6
Added "aidx" option to be able to enable audio for a particular stream [link](https://www.tapatalk.com/groups/rpisurv/audio-t11-s20.html).
This is a one to one mapping with the omxplayer aidx (Audio stream index) option, the default for rpisurv is the value -1 (audio disabled).
Expand Down
3 changes: 3 additions & 0 deletions surveillance/core/CameraStream.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,9 @@ def is_connectable(self):
except socket.timeout as e:
logger.error("CameraStream: " + self.name + " " + str(self.obfuscated_credentials_url) + " Not Connectable (failed socket connect, configured timeout: " + str(self.probe_timeout) + " ), " + repr(e))
return False
except Exception as e:
logger.error("CameraStream: " + self.name + " " + str(self.obfuscated_credentials_url) + " Not Connectable (" + repr(e) + " )")
return False
else:
logger.error("CameraStream: " + self.name + " Scheme " + str(self.scheme) + " in " + str(self.obfuscated_credentials_url) + " is currently not supported, you can make a feature request on https://community.rpisurv.net")
sys.exit()
Expand Down
2 changes: 1 addition & 1 deletion surveillance/surveillance.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def handle_keypresses():
#Setup logger
logger = setup_logging()

fullversion_for_installer = "2.1.6"
fullversion_for_installer = "2.1.7"

version = fullversion_for_installer
logger.info("Starting rpisurv " + version)
Expand Down

0 comments on commit 60c87a8

Please sign in to comment.