[update]schedule

Config/setting.py

@@ -18,14 +18,17 @@ from logging import getLogger
 log = getLogger(__name__)
 
 HEADER = """
-    ______                        ______             _
-    | ___ \_                      | ___ \           | |
-    | |_/ / \__ __   __  _ __   _ | |_/ /___   ___  | |
-    |  __/|  _// _ \ \ \/ /| | | ||  __// _ \ / _ \ | |
-    | |   | | | (_) | >  < \ |_| || |  | (_) | (_) || |___
-    \_|   |_|  \___/ /_/\_\ \__  |\_|   \___/ \___/ \_____\
-                           __ / /
-                          /___ /
+****************************************************************
+*** ______  ********************* ______ *********** _  ********
+*** | ___ \_ ******************** | ___ \ ********* | | ********
+*** | |_/ / \__ __   __  _ __   _ | |_/ /___ * ___  | | ********
+*** |  __/|  _// _ \ \ \/ /| | | ||  __// _ \ / _ \ | | ********
+*** | |   | | | (_) | >  < \ |_| || |  | (_) | (_) || |___  ****
+*** \_|   |_|  \___/ /_/\_\ \__  |\_|   \___/ \___/ \_____/ ****
+****                       __ / /                          *****
+************************* /___ / *******************************
+*************************       ********************************
+****************************************************************
 """
 
 PY3 = sys.version_info >= (3,)
@@ -38,11 +41,11 @@ DB_PASSWORD = getenv('db_password', '')
 """ 数据库配置 """
 DATABASES = {
     "default": {
-        "TYPE": "REDIS",
-        "HOST": "19.19.22.54",
-        "PORT": "6379",
+        "TYPE": DB_TYPE,
+        "HOST": DB_HOST,
+        "PORT": DB_PORT,
         "NAME": "proxy",
-        "PASSWORD": "_@Fintell"
+        "PASSWORD": DB_PASSWORD
     }
 }
 

ProxyHelper/ProxyHelper.py → ProxyHelper/ProxyUtil.py

@@ -12,7 +12,6 @@
 """
 __author__ = 'JHao'
 
-from ProxyHelper import Proxy
 from Util import validUsefulProxy
 
 from datetime import datetime
@@ -39,4 +38,3 @@ def checkProxyUseful(proxy_obj):
         proxy_obj.last_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         proxy_obj.fail_count += 1
         return proxy_obj, False
-

ProxyHelper/__init__.py

@@ -13,4 +13,4 @@
 __author__ = 'JHao'
 
 from ProxyHelper.Proxy import Proxy
-from ProxyHelper.ProxyHelper import checkProxyUseful
+from ProxyHelper.ProxyUtil import checkProxyUseful

Schedule/ProxyScheduler.py

@@ -44,7 +44,10 @@ def usefulProxyScheduler():
     doUsefulProxyCheck()
 
 
-if __name__ == '__main__':
+def runScheduler():
+    rawProxyScheduler()
+    usefulProxyScheduler()
+
     scheduler_log = LogHandler("scheduler_log")
     scheduler = BlockingScheduler(logger=scheduler_log)
 
@@ -52,3 +55,7 @@ if __name__ == '__main__':
     scheduler.add_job(usefulProxyScheduler, 'interval', minutes=1, id="useful_proxy_check", name="useful_proxy定时检查")
 
     scheduler.start()
+
+
+if __name__ == '__main__':
+    runScheduler()