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

Catch exception when retrieiving data for notifier configs

Browse source
This commit is contained in:
JonnyWong16 2018-09-28 18:21:04 -07:00
commit 045c69f5d8
1 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

28
plexpy/notifiers.py
View file

@ -2091,6 +2091,7 @@ class JOIN(Notifier):
if self.config['api_key']: if self.config['api_key']:
params = {'apikey': self.config['api_key']} params = {'apikey': self.config['api_key']}
try:
r = requests.get('https://joinjoaomgcd.appspot.com/_ah/api/registration/v1/listDevices', params=params) r = requests.get('https://joinjoaomgcd.appspot.com/_ah/api/registration/v1/listDevices', params=params)
if r.status_code == 200: if r.status_code == 200:
@ -2098,17 +2099,17 @@ class JOIN(Notifier):
if response_data.get('success'): if response_data.get('success'):
response_devices = response_data.get('records', []) response_devices = response_data.get('records', [])
devices.update({d['deviceName']: d['deviceName'] for d in response_devices}) devices.update({d['deviceName']: d['deviceName'] for d in response_devices})
return devices
else: else:
error_msg = response_data.get('errorMessage') error_msg = response_data.get('errorMessage')
logger.info(u"Tautulli Notifiers :: Unable to retrieve {name} devices list: {msg}".format(name=self.NAME, msg=error_msg)) logger.error(u"Tautulli Notifiers :: Unable to retrieve {name} devices list: {msg}".format(name=self.NAME, msg=error_msg))
return devices
else: else:
logger.error(u"Tautulli Notifiers :: Unable to retrieve {name} devices list: [{r.status_code}] {r.reason}".format(name=self.NAME, r=r)) logger.error(u"Tautulli Notifiers :: Unable to retrieve {name} devices list: [{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
logger.debug(u"Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True))) logger.debug(u"Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True)))
return devices
else: except Exception as e:
logger.error(u"Tautulli Notifiers :: Unable to retrieve {name} devices list: {msg}".format(name=self.NAME, msg=e))
return devices return devices
def return_config_options(self): def return_config_options(self):
@ -2679,27 +2680,28 @@ class PUSHBULLET(Notifier):
return self.make_request('https://api.pushbullet.com/v2/pushes', headers=headers, json=data) return self.make_request('https://api.pushbullet.com/v2/pushes', headers=headers, json=data)
def get_devices(self): def get_devices(self):
devices = {'': ''}
if self.config['api_key']: if self.config['api_key']:
headers = {'Content-type': "application/json", headers = {'Content-type': "application/json",
'Access-Token': self.config['api_key'] 'Access-Token': self.config['api_key']
} }
try:
r = requests.get('https://api.pushbullet.com/v2/devices', headers=headers) r = requests.get('https://api.pushbullet.com/v2/devices', headers=headers)
if r.status_code == 200: if r.status_code == 200:
response_data = r.json() response_data = r.json()
devices = response_data.get('devices', []) pushbullet_devices = response_data.get('devices', [])
devices = {d['iden']: d['nickname'] for d in devices if d['active']} devices.update({d['iden']: d['nickname'] for d in pushbullet_devices if d['active']})
devices.update({'': ''})
return devices
else: else:
logger.error(u"Tautulli Notifiers :: Unable to retrieve {name} devices list: " logger.error(u"Tautulli Notifiers :: Unable to retrieve {name} devices list: "
u"[{r.status_code}] {r.reason}".format(name=self.NAME, r=r)) u"[{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
logger.debug(u"Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True))) logger.debug(u"Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True)))
return {'': ''}
else: except Exception as e:
return {'': ''} logger.error(u"Tautulli Notifiers :: Unable to retrieve {name} devices list: {msg}".format(name=self.NAME, msg=e))
return devices
def return_config_options(self): def return_config_options(self):
config_option = [{'label': 'Pushbullet Access Token', config_option = [{'label': 'Pushbullet Access Token',