Merge branch 'master' into master

proxypool/crawlers/public/fatezero_proxylist.py

@@ -25,7 +25,6 @@ def parse(self, html):
                 port = ip_address['port']
                 yield Proxy(host=host, port=port)
 
-
 if __name__ == '__main__':
     crawler = FatezeroCrawler()
     for proxy in crawler.crawl():

proxypool/crawlers/public/ihuan.py

@@ -12,8 +12,7 @@ class IhuanCrawler(BaseCrawler):
     """
     path = time.strftime("%Y/%m/%d/%H", time.localtime())
     urls = [BASE_URL.format(path=path)]
-    ignore = True
-
+    ignore = False
     def parse(self, html):
         """
         parse html file to get proxies

proxypool/setting.py

@@ -77,4 +77,5 @@
 ENABLE_SERVER = env.bool('ENABLE_SERVER', True)
 
 # logger.add(env.str('LOG_RUNTIME_FILE', join(LOG_DIR, 'runtime.log')), level='DEBUG', rotation='1 week', retention='20 days')
-# logger.add(env.str('LOG_ERROR_FILE', join(LOG_DIR, 'error.log')), level='ERROR', rotation='1 week')
+# logger.add(env.str('LOG_ERROR_FILE', join(LOG_DIR, 'error.log')), level='ERROR', rotation='1 week')
+