jhao пре 7 година
родитељ
комит
e41a9cbe79
2 измењених фајлова са 10 додато и 14 уклоњено
  1. 4 6
      DB/DbClient.py
  2. 6 8
      DB/SsdbClient.py

+ 4 - 6
DB/DbClient.py

@@ -44,7 +44,7 @@ class DbClient(object):
 
         所有方法需要相应类去具体实现:
             SSDB:SsdbClient.py
-            REDIS:RedisClient.py
+            REDIS:RedisClient.py  停用 统一使用SsdbClient.py
 
     """
 
@@ -66,7 +66,7 @@ class DbClient(object):
         if "SSDB" == config.db_type:
             __type = "SsdbClient"
         elif "REDIS" == config.db_type:
-            __type = "RedisClient"
+            __type = "SsdbClient"
         elif "MONGODB" == config.db_type:
             __type = "MongodbClient"
         else:
@@ -107,7 +107,5 @@ class DbClient(object):
 
 if __name__ == "__main__":
     account = DbClient()
-    print(account.get())
-    account.changeTable('use')
-    account.put('ac')
-    print(account.get())
+    account.changeTable('useful_proxy')
+    print(account.pop())

+ 6 - 8
DB/SsdbClient.py

@@ -31,16 +31,13 @@ class SsdbClient(object):
         验证后的代理存放在name为useful_proxy的hash中,key为代理的ip:port,value为一个计数,初始为1,每校验失败一次减1;
 
     """
-    # 为了保持DbClient的标准
-    # 在SsdbClient里面接受username参数, 但不进行使用.
-    # 因为不能将username通过kwargs传进redis.Redis里面, 会报错:
-    # TypeError: __init__() got an unexpected keyword argument 'username'
-    def __init__(self, name, username, **kwargs):
+    def __init__(self, name, **kwargs):
         """
         init
         :param name: hash name
-        :param host: ssdb host
-        :param port: ssdb port
+        :param host: host
+        :param port: port
+        :param password: password
         :return:
         """
         self.name = name
@@ -114,6 +111,7 @@ class SsdbClient(object):
     def changeTable(self, name):
         self.name = name
 
+
 if __name__ == '__main__':
-    c = SsdbClient('useful_proxy', '118.24.52.95', 8899)
+    c = SsdbClient(name='useful_proxy', host='127.0.0.1', port=8899, password=None)
     print(c.getAll())