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

Move service scheme validation into Service.__call__

Browse Source 
Keeps where the schema is stored and validated close.
This commit is contained in:
Jan Harkes 2016-03-31 15:04:50 -04:00
parent 64030b9d48
commit 5bd58351c7
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
homeassistant/core.py
View File

@ -514,7 +514,14 @@ class Service(object):
def __call__(self, call):
"""Execute the service."""
self.func(call)
try:
if self.schema:
call.data = self.schema(call.data)
self.func(call)
except vol.MultipleInvalid as ex:
_LOGGER.error('Invalid service data for %s.%s: %s',
call.domain, call.service, ex)
# pylint: disable=too-few-public-methods
@ -642,15 +649,6 @@ class ServiceRegistry(object):
return
service_handler = self._services[domain][service]
service_validator = service_handler.schema
try:
if service_validator:
service_data = service_validator(service_data)
except vol.MultipleInvalid as ex:
_LOGGER.error('Invalid service data for %s.%s: %s',
domain, service, ex)
return
service_call = ServiceCall(domain, service, service_data, call_id)
# Add a job to the pool that calls _execute_service