github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-12 08:16:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Catch invalid json for custom conditions

Browse source
This commit is contained in:
JonnyWong16 2018-03-11 20:59:18 -07:00
parent a3643b4302
commit 37afd141be
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plexpy/notification_handler.py
View file

@ -208,7 +208,10 @@ def notify_custom_conditions(notifier_id=None, parameters=None):
notifier_config = notifiers.get_notifier_config(notifier_id=notifier_id) notifier_config = notifiers.get_notifier_config(notifier_id=notifier_id)
custom_conditions_logic = notifier_config['custom_conditions_logic'] custom_conditions_logic = notifier_config['custom_conditions_logic']
custom_conditions = json.loads(notifier_config['custom_conditions']) or [] try:
custom_conditions = json.loads(notifier_config['custom_conditions']) or []
except ValueError as e:
custom_conditions = []
if custom_conditions_logic or any(c for c in custom_conditions if c['value']): if custom_conditions_logic or any(c for c in custom_conditions if c['value']):
logger.debug(u"Tautulli NotificationHandler :: Checking custom notification conditions for notifier_id %s." logger.debug(u"Tautulli NotificationHandler :: Checking custom notification conditions for notifier_id %s."