X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rrequests.py;h=4612a8d5384dd2b03a31145132066be3ce33bf77;hb=8e4df3830e6f68b691cb833415d30ab5d37338c9;hp=f0d04dae377cd16f0d1e4194e0a43b8a190168fc;hpb=00ddc855d130a8ce37f1efcd00ca225b656fbfce;p=bookmarks_db.git diff --git a/Robots/bkmk_rrequests.py b/Robots/bkmk_rrequests.py index f0d04da..4612a8d 100644 --- a/Robots/bkmk_rrequests.py +++ b/Robots/bkmk_rrequests.py @@ -51,14 +51,14 @@ class robot_requests(robot_base): error, r = request_get(url, headers, self.timeout, None) if error is not None: self.log(' Error: %s' % error) - if self.proxy: + if self.proxy and error != '404 not_found': self.log(' Retrying with the proxy...') error, r = request_get(url, headers, self.timeout, self.proxy) if error is None: self.proxy_ok.add(url_host) if error is not None: - if self.proxy: + if self.proxy and error != '404 not_found': self.log(' Proxy error: %s' % error) if url_host not in self.proxy_ok: self.proxy_error.add(url_host) @@ -84,4 +84,7 @@ def request_get(url, headers, timeout, proxy): except requests.RequestException as e: return str(e), None else: + if r.status_code >= 400: + error = requests.status_codes._codes[r.status_code][0] + return '%d %s' % (r.status_code, error), None return None, r