Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for rate limits should be optional (#22823)

pull/22883/head
Robbie Trencheny 2019-04-07 07:37:27 -07:00 committed by Pascal Vizeli
parent f51e8c3012
commit 236e484dc2
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
homeassistant/components/mobile_app/const.py
View File

@ -42,6 +42,11 @@ ATTR_OS_NAME = 'os_name'
ATTR_OS_VERSION = 'os_version' ATTR_OS_VERSION = 'os_version'
ATTR_PUSH_TOKEN = 'push_token' ATTR_PUSH_TOKEN = 'push_token'
ATTR_PUSH_URL = 'push_url' ATTR_PUSH_URL = 'push_url'
ATTR_PUSH_RATE_LIMITS = 'rateLimits'
ATTR_PUSH_RATE_LIMITS_ERRORS = 'errors'
ATTR_PUSH_RATE_LIMITS_MAXIMUM = 'maximum'
ATTR_PUSH_RATE_LIMITS_RESETS_AT = 'resetsAt'
ATTR_PUSH_RATE_LIMITS_SUCCESSFUL = 'successful'
ATTR_SUPPORTS_ENCRYPTION = 'supports_encryption' ATTR_SUPPORTS_ENCRYPTION = 'supports_encryption'
ATTR_EVENT_DATA = 'event_data' ATTR_EVENT_DATA = 'event_data'

28
homeassistant/components/mobile_app/notify.py
View File

@ -8,13 +8,18 @@ import async_timeout
from homeassistant.components.notify import ( from homeassistant.components.notify import (
ATTR_DATA, ATTR_MESSAGE, ATTR_TARGET, ATTR_TITLE, ATTR_TITLE_DEFAULT, ATTR_DATA, ATTR_MESSAGE, ATTR_TARGET, ATTR_TITLE, ATTR_TITLE_DEFAULT,
BaseNotificationService) BaseNotificationService)
from homeassistant.components.mobile_app.const import (
ATTR_APP_DATA, ATTR_APP_ID, ATTR_APP_VERSION, ATTR_DEVICE_NAME,
ATTR_OS_VERSION, ATTR_PUSH_TOKEN, ATTR_PUSH_URL, DATA_CONFIG_ENTRIES,
DOMAIN)
from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.aiohttp_client import async_get_clientsession
import homeassistant.util.dt as dt_util import homeassistant.util.dt as dt_util
from .const import (ATTR_APP_DATA, ATTR_APP_ID, ATTR_APP_VERSION,
ATTR_DEVICE_NAME, ATTR_OS_VERSION, ATTR_PUSH_RATE_LIMITS,
ATTR_PUSH_RATE_LIMITS_ERRORS,
ATTR_PUSH_RATE_LIMITS_MAXIMUM,
ATTR_PUSH_RATE_LIMITS_RESETS_AT,
ATTR_PUSH_RATE_LIMITS_SUCCESSFUL, ATTR_PUSH_TOKEN,
ATTR_PUSH_URL, DATA_CONFIG_ENTRIES, DOMAIN)
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
DEPENDENCIES = ['mobile_app'] DEPENDENCIES = ['mobile_app']
@ -38,16 +43,21 @@ def push_registrations(hass):
# pylint: disable=invalid-name # pylint: disable=invalid-name
def log_rate_limits(hass, device_name, resp, level=logging.INFO): def log_rate_limits(hass, device_name, resp, level=logging.INFO):
"""Output rate limit log line at given level.""" """Output rate limit log line at given level."""
rate_limits = resp['rateLimits'] if ATTR_PUSH_RATE_LIMITS not in resp:
resetsAt = dt_util.parse_datetime(rate_limits['resetsAt']) return
resetsAtTime = resetsAt - datetime.now(timezone.utc)
rate_limits = resp[ATTR_PUSH_RATE_LIMITS]
resetsAt = rate_limits[ATTR_PUSH_RATE_LIMITS_RESETS_AT]
resetsAtTime = (dt_util.parse_datetime(resetsAt) -
datetime.now(timezone.utc))
rate_limit_msg = ("mobile_app push notification rate limits for %s: " rate_limit_msg = ("mobile_app push notification rate limits for %s: "
"%d sent, %d allowed, %d errors, " "%d sent, %d allowed, %d errors, "
"resets in %s") "resets in %s")
_LOGGER.log(level, rate_limit_msg, _LOGGER.log(level, rate_limit_msg,
device_name, device_name,
rate_limits['successful'], rate_limits[ATTR_PUSH_RATE_LIMITS_SUCCESSFUL],
rate_limits['maximum'], rate_limits['errors'], rate_limits[ATTR_PUSH_RATE_LIMITS_MAXIMUM],
rate_limits[ATTR_PUSH_RATE_LIMITS_ERRORS],
str(resetsAtTime).split(".")[0]) str(resetsAtTime).split(".")[0])