jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-12 15:57:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename log message / handle cancellederror on image proxy (#5331)

Browse Source
This commit is contained in:
Pascal Vizeli 2017-01-15 17:35:58 +01:00 committed by Paulus Schoutsen
parent 85a84549eb
commit c458ee29f2
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/components/camera/__init__.py
View File

@ -175,7 +175,7 @@ class Camera(Entity):
yield from asyncio.sleep(.5) yield from asyncio.sleep(.5)
except asyncio.CancelledError: except asyncio.CancelledError:
_LOGGER.debug("Close stream by browser.") _LOGGER.debug("Close stream by frontend.")
response = None response = None
finally: finally:
@ -249,12 +249,16 @@ class CameraImageView(CameraView):
@asyncio.coroutine @asyncio.coroutine
def handle(self, request, camera): def handle(self, request, camera):
"""Serve camera image.""" """Serve camera image."""
image = yield from camera.async_camera_image() try:
image = yield from camera.async_camera_image()
if image is None: if image is None:
return web.Response(status=500) return web.Response(status=500)
return web.Response(body=image) return web.Response(body=image)
except asyncio.CancelledError:
_LOGGER.debug("Close stream by frontend.")
class CameraMjpegStream(CameraView): class CameraMjpegStream(CameraView):

2
homeassistant/components/camera/ffmpeg.py
View File

@ -86,7 +86,7 @@ class FFmpegCamera(Camera):
response.write(data) response.write(data)
except asyncio.CancelledError: except asyncio.CancelledError:
_LOGGER.debug("Close stream by browser.") _LOGGER.debug("Close stream by frontend.")
response = None response = None
finally: finally:

2
homeassistant/components/camera/mjpeg.py
View File

@ -125,7 +125,7 @@ class MjpegCamera(Camera):
raise HTTPGatewayTimeout() raise HTTPGatewayTimeout()
except asyncio.CancelledError: except asyncio.CancelledError:
_LOGGER.debug("Close stream by browser.") _LOGGER.debug("Close stream by frontend.")
response = None response = None
finally: finally:

2
homeassistant/components/camera/synology.py
View File

@ -277,7 +277,7 @@ class SynologyCamera(Camera):
raise HTTPGatewayTimeout() raise HTTPGatewayTimeout()
except asyncio.CancelledError: except asyncio.CancelledError:
_LOGGER.debug("Close stream by browser.") _LOGGER.debug("Close stream by frontend.")
response = None response = None
finally: finally: