dinislage/CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Catch xbmc turned off error

Browse Source
This commit is contained in:
Ruud
2014-01-15 21:51:27 +01:00
parent 6cc802952f
commit 5ea13eeffd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/notifications/xbmc/main.py
+3 -2
View File
@@ -8,6 +8,7 @@ import socket
import traceback import traceback
import urllib import urllib
import requests import requests
from requests.packages.urllib3.exceptions import MaxRetryError
log = CPLog(__name__) log = CPLog(__name__)
@@ -168,7 +169,7 @@ class XBMC(Notification):
# manually fake expected response array # manually fake expected response array
return [{'result': 'Error'}] return [{'result': 'Error'}]
except requests.exceptions.Timeout: except (MaxRetryError, requests.exceptions.Timeout):
log.info2('Couldn\'t send request to XBMC, assuming it\'s turned off') log.info2('Couldn\'t send request to XBMC, assuming it\'s turned off')
return [{'result': 'Error'}] return [{'result': 'Error'}]
except: except:
@@ -203,7 +204,7 @@ class XBMC(Notification):
log.debug('Returned from request %s: %s', (host, response)) log.debug('Returned from request %s: %s', (host, response))
return response return response
except requests.exceptions.Timeout: except (MaxRetryError, requests.exceptions.Timeout):
log.info2('Couldn\'t send request to XBMC, assuming it\'s turned off') log.info2('Couldn\'t send request to XBMC, assuming it\'s turned off')
return [] return []
except: except: