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

Bugfix camera fake image (#5314)

Browse Source 
* Bugfix camera fake image

* add logger
This commit is contained in:
Pascal Vizeli 2017-01-14 11:53:00 +01:00 committed by GitHub
parent c2492d1493
commit b817c7d0c2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,8 @@ from homeassistant.helpers.entity_component import EntityComponent
from homeassistant.helpers.config_validation import PLATFORM_SCHEMA # noqa from homeassistant.helpers.config_validation import PLATFORM_SCHEMA # noqa
from homeassistant.components.http import HomeAssistantView, KEY_AUTHENTICATED from homeassistant.components.http import HomeAssistantView, KEY_AUTHENTICATED
_LOGGER = logging.getLogger(__name__)
DOMAIN = 'camera' DOMAIN = 'camera'
DEPENDENCIES = ['http'] DEPENDENCIES = ['http']
SCAN_INTERVAL = timedelta(seconds=30) SCAN_INTERVAL = timedelta(seconds=30)
@ -72,8 +74,7 @@ def async_get_image(hass, entity_id, timeout=10):
@asyncio.coroutine @asyncio.coroutine
def async_setup(hass, config): def async_setup(hass, config):
"""Setup the camera component.""" """Setup the camera component."""
component = EntityComponent( component = EntityComponent(_LOGGER, DOMAIN, hass, SCAN_INTERVAL)
logging.getLogger(__name__), DOMAIN, hass, SCAN_INTERVAL)
hass.http.register_view(CameraImageView(component.entities)) hass.http.register_view(CameraImageView(component.entities))
hass.http.register_view(CameraMjpegStream(component.entities)) hass.http.register_view(CameraMjpegStream(component.entities))
@ -172,8 +173,14 @@ class Camera(Entity):
yield from response.drain() yield from response.drain()
yield from asyncio.sleep(.5) yield from asyncio.sleep(.5)
except asyncio.CancelledError:
_LOGGER.debug("Close stream by browser.")
response = None
finally: finally:
yield from response.write_eof() if response is not None:
yield from response.write_eof()
@property @property
def state(self): def state(self):