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

Catch maxretry error

Browse Source 
Don't fill logs with duplicate logs
This commit is contained in:
Ruud
2014-01-15 21:38:00 +01:00
parent 190b9db645
commit 6cc802952f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
couchpotato/core/plugins/base.py
+5 -3
View File
@@ -5,6 +5,8 @@ from couchpotato.core.helpers.variable import getExt, md5, isLocalIP
from couchpotato.core.logger import CPLog from couchpotato.core.logger import CPLog
from couchpotato.environment import Env from couchpotato.environment import Env
import requests import requests
from requests.packages.urllib3 import Timeout
from requests.packages.urllib3.exceptions import MaxRetryError
from tornado import template from tornado import template
from tornado.web import StaticFileHandler from tornado.web import StaticFileHandler
from urlparse import urlparse from urlparse import urlparse
@@ -173,9 +175,9 @@ class Plugin(object):
data = response.content if return_raw else response.text data = response.content if return_raw else response.text
self.http_failed_request[host] = 0 self.http_failed_request[host] = 0
except IOError: except (IOError, MaxRetryError, Timeout):
if show_error: if show_error:
log.error('Failed opening url in %s: %s %s', (self.getName(), url, traceback.format_exc(1))) log.error('Failed opening url in %s: %s %s', (self.getName(), url, traceback.format_exc(0)))
# Save failed requests by hosts # Save failed requests by hosts
try: try:
@@ -265,7 +267,7 @@ class Plugin(object):
if not kwargs.get('show_error', True): if not kwargs.get('show_error', True):
raise raise
log.error('Failed getting cache: %s', (traceback.format_exc())) log.debug('Failed getting cache: %s', (traceback.format_exc(0)))
return '' return ''
def setCache(self, cache_key, value, timeout = 300): def setCache(self, cache_key, value, timeout = 300):