Germey 8 лет назад
Родитель
Сommit
2cafcfdf61
6 измененных файлов с 17 добавлено и 21 удалено
  1. 5 2
      proxypool/db.py
  2. 0 2
      proxypool/schedule.py
  3. 6 2
      proxypool/setting.py
  4. 5 5
      requirements.txt
  5. 0 9
      run.py
  6. 1 1
      setup.py

+ 5 - 2
proxypool/db.py

@@ -1,11 +1,14 @@
 import redis
 from proxypool.error import PoolEmptyError
-from proxypool.setting import HOST, PORT
+from proxypool.setting import HOST, PORT, PASSWORD
 
 
 class RedisClient(object):
     def __init__(self, host=HOST, port=PORT):
-        self._db = redis.Redis(host, port)
+        if PASSWORD:
+            self._db = redis.Redis(host=host, port=port, password=PASSWORD)
+        else:
+            self._db = redis.Redis(host=host, port=port)
 
     def get(self, count=1):
         """

+ 0 - 2
proxypool/schedule.py

@@ -129,5 +129,3 @@ class Schedule(object):
         check_process = Process(target=Schedule.check_pool)
         valid_process.start()
         check_process.start()
-
-

+ 6 - 2
proxypool/setting.py

@@ -1,13 +1,17 @@
-# Redis Host
+# Redis数据库的地址和端口
 HOST = 'localhost'
-# Redis PORT
 PORT = 6379
 
+# 如果Redis有密码,则添加这句密码,否则设置为None
+PASSWORD = 'foobared'
 
+# 代理池数量界限
 POOL_LOWER_THRESHOLD = 10
 POOL_UPPER_THRESHOLD = 100
 
+# 检查周期
 VALID_CHECK_CYCLE = 60
 POOL_LEN_CHECK_CYCLE = 20
 
+# 测试API,用百度来测试
 TEST_API='http://www.baidu.com'

+ 5 - 5
requirements.txt

@@ -1,5 +1,5 @@
-aiohttp==1.3.3
-Flask==0.11.1
-redis==2.10.5
-requests==2.13.0
-pyquery==1.2.17
+aiohttp>=1.3.3
+Flask>=0.11.1
+redis>=2.10.5
+requests>=2.13.0
+pyquery>=1.2.17

+ 0 - 9
run.py

@@ -1,14 +1,5 @@
-"""
--------------------------------------------------
-    File Name:     run.py
-    Description:   程序的入口。
-    Author:        Liu
-    Date:          2016/12/9
--------------------------------------------------
-"""
 from proxypool.api import app
 from proxypool.schedule import Schedule
-from multiprocessing import Process
 
 def main():
     s = Schedule()

+ 1 - 1
setup.py

@@ -5,7 +5,7 @@ setup(
     version='1.0.0',
     description='High performance proxy pool',
     long_description='A proxy pool project modified from WiseDoge/ProxyPool',
-    author='Germey',
+    author=['Germey', 'WiseDoge'],
     author_email='[email protected]',
     url='https://github.com/Germey/ProxyPool',
     packages=[