From fcb069c7ded15ae62f1b0142fb04a432d3a029e2 Mon Sep 17 00:00:00 2001 From: j Date: Thu, 18 Feb 2016 17:08:41 +0530 Subject: [PATCH] no traceback for proxy error --- oml/nodes.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/oml/nodes.py b/oml/nodes.py index 00c28e4..5f05207 100644 --- a/oml/nodes.py +++ b/oml/nodes.py @@ -12,6 +12,7 @@ from datetime import datetime import os import time import socket +import socks import ox from tornado.ioloop import PeriodicCallback @@ -300,6 +301,9 @@ class Node(Thread): except socket.timeout: logger.debug('timeout %s', url) return False + except socks.GeneralProxyError: + logger.debug('openurl failed %s', url) + return False except: logger.debug('openurl failed %s', url, exc_info=True) return False @@ -357,6 +361,12 @@ class Node(Thread): self._opener.addheaders = list(zip(self.headers.keys(), self.headers.values())) try: r = self._opener.open(url, timeout=self.TIMEOUT*2) + except socket.timeout: + logger.debug('timeout %s', url) + return False + except socks.GeneralProxyError: + logger.debug('download failed %s', url) + return False except: logger.debug('download failed %s', url, exc_info=True) self.online = False