cobweb-launcher 1.2.51__py3-none-any.whl → 1.2.53__py3-none-any.whl

cobweb/db/redis_db.py

@@ -6,60 +6,90 @@ class RedisDB:
 
     def __init__(self, **kwargs):
         redis_config = kwargs or setting.REDIS_CONFIG
-        pool = redis.ConnectionPool(**redis_config)
-        self._client = redis.Redis(connection_pool=pool)
+        # pool = redis.ConnectionPool(**redis_config)
+        self.pool = redis.ConnectionPool(
+            max_connections=25,
+            **redis_config
+        )
+        
+    def get_connection(self):
+        return redis.StrictRedis(connection_pool=self.pool)
+        # self._client = redis.Redis(connection_pool=pool)
+
+    def get(self, name):
+        with self.get_connection() as client:
+            return client.get(name)
+
+    def incrby(self, name, value):
+        with self.get_connection() as client:
+            client.incrby(name, value)
 
     def setnx(self, name, value=""):
-        return self._client.setnx(name, value)
+        with self.get_connection() as client:
+            client.setnx(name, value)
 
     def setex(self, name, t, value=""):
-        return self._client.setex(name, t, value)
+        with self.get_connection() as client:
+            client.setex(name, t, value)
 
     def expire(self, name, t, nx: bool = False, xx: bool = False, gt: bool = False, lt: bool = False):
-        return self._client.expire(name, t, nx, xx, gt, lt)
+        with self.get_connection() as client:
+            client.expire(name, t, nx, xx, gt, lt)
 
     def ttl(self, name):
-        return self._client.ttl(name)
+        with self.get_connection() as client:
+            return client.ttl(name)
 
     def delete(self, name):
-        return self._client.delete(name)
+        with self.get_connection() as client:
+            return client.delete(name)
 
     def exists(self, *name) -> bool:
-        return self._client.exists(*name)
+        with self.get_connection() as client:
+            return client.exists(*name)
 
     def sadd(self, name, value):
-        return self._client.sadd(name, value)
+        with self.get_connection() as client:
+            return client.sadd(name, value)
 
     def zcard(self, name) -> bool:
-        return self._client.zcard(name)
+        with self.get_connection() as client:
+            return client.zcard(name)
 
     def zadd(self, name, item: dict, **kwargs):
-        return self._client.zadd(name, item, **kwargs)
+        with self.get_connection() as client:
+            return client.zadd(name, item, **kwargs)
 
     def zrem(self, name, *value):
-        return self._client.zrem(name, *value)
+        with self.get_connection() as client:
+            return client.zrem(name, *value)
 
     def zcount(self, name, _min, _max):
-        return self._client.zcount(name, _min, _max)
+        with self.get_connection() as client:
+            return client.zcount(name, _min, _max)
 
     # def zrangebyscore(self, name, _min, _max, start, num, withscores: bool = False, *args):
-    #     return self._client.zrangebyscore(name, _min, _max, start, num, withscores, *args)
+    #     with self.get_connection() as client:
+    #        return client.zrangebyscore(name, _min, _max, start, num, withscores, *args)
 
     def lua(self, script: str, keys: list = None, args: list = None):
         keys = keys or []
         args = args or []
         keys_count = len(keys)
-        return self._client.eval(script, keys_count, *keys, *args)
+        with self.get_connection() as client:
+            return client.eval(script, keys_count, *keys, *args)
 
     def lua_sha(self, sha1: str, keys: list = None, args: list = None):
         keys = keys or []
         args = args or []
         keys_count = len(keys)
-        return self._client.evalsha(sha1, keys_count, *keys, *args)
+        with self.get_connection() as client:
+            return client.evalsha(sha1, keys_count, *keys, *args)
 
     def execute_lua(self, lua_script: str, keys: list, *args):
-        execute = self._client.register_script(lua_script)
-        return execute(keys=keys, args=args)
+        with self.get_connection() as client:
+            execute = client.register_script(lua_script)
+            return execute(keys=keys, args=args)
 
     def lock(self, key, t=15) -> bool:
         lua_script = """

cobweb/launchers/launcher.py

@@ -51,6 +51,8 @@ class Launcher(threading.Thread):
         "_delete",
     ]
 
+    __WORKER_THREAD__ = {}
+
     def __init__(self, task, project, custom_setting=None, **kwargs):
         super().__init__()
         self.task = task
@@ -179,9 +181,22 @@ class Launcher(threading.Thread):
 
     def _execute(self):
         for func_name in self.__LAUNCHER_FUNC__:
-            threading.Thread(name=func_name, target=getattr(self, func_name)).start()
+            worker_thread = threading.Thread(name=func_name, target=getattr(self, func_name))
+            self.__WORKER_THREAD__[func_name] = worker_thread
+            worker_thread.start()
             time.sleep(1)
 
+    def _monitor(self):
+        while True:
+            for func_name, worker_thread in self.__WORKER_THREAD__.items():
+                if not worker_thread.is_alive():
+                    logger.info(f"{func_name} thread is dead. Restarting...")
+                    target = getattr(self, func_name)
+                    worker_thread = threading.Thread(name=func_name, target=target)
+                    self.__WORKER_THREAD__[func_name] = worker_thread
+                    worker_thread.start()
+                time.sleep(5)
+
     def run(self):
         threading.Thread(target=self._execute_heartbeat).start()
 
@@ -210,6 +225,8 @@ class Launcher(threading.Thread):
             wait_seconds=self._upload_queue_wait_seconds
         ).start()
 
+        threading.Thread(target=self._monitor).start()
+
         self._execute()
         self._polling()
 

cobweb/launchers/launcher_pro.py

@@ -40,11 +40,11 @@ class LauncherPro(Launcher):
         if not self._task_model and not self._db.exists(key):
             self._db.setex(key, 86400 * 30, int(count))
         else:
-            self._db._client.incrby(key, count)
+            self._db.incrby(key, count)
 
     def _get_seed(self) -> Seed:
         if self._speed_control:
-            spider_speed = self._db._client.get(self._speed_control_key)
+            spider_speed = self._db.get(self._speed_control_key)
             if int(spider_speed or 0) > self._spider_max_count:
                 expire_time = self._db.ttl(self._speed_control_key)
                 if expire_time == -1:
@@ -55,7 +55,7 @@ class LauncherPro(Launcher):
                 return None
         seed = self.__LAUNCHER_QUEUE__["todo"].pop()
         if self._speed_control and seed and not self._db.lock(self._speed_control_key, t=self._time_window):
-            self._db._client.incrby(self._speed_control_key, 1)
+            self._db.incrby(self._speed_control_key, 1)
         return seed
 
     @check_pause

{cobweb_launcher-1.2.51.dist-info → cobweb_launcher-1.2.53.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cobweb-launcher
-Version: 1.2.51
+Version: 1.2.53
 Summary: spider_hole
 Home-page: https://github.com/Juannie-PP/cobweb
 Author: Juannie-PP

{cobweb_launcher-1.2.51.dist-info → cobweb_launcher-1.2.53.dist-info}/RECORD

@@ -17,14 +17,14 @@ cobweb/crawlers/crawler.py,sha256=pePDGroD6JJAht5QTU51L7MkFIY4ob9TKpznZ2wUmsw,89
 cobweb/crawlers/file_crawler.py,sha256=2Sjbdgxzqd41WykKUQE3QQlGai3T8k-pmHNmPlTchjQ,4454
 cobweb/db/__init__.py,sha256=uZwSkd105EAwYo95oZQXAfofUKHVIAZZIPpNMy-hm2Q,56
 cobweb/db/api_db.py,sha256=bDc5dJQxq4z04h70KUTHd0OqUOEY7Cm3wcNJZtTvJIM,3015
-cobweb/db/redis_db.py,sha256=fumNZJiio-uQqRcSrymx8eJ1PqsdOwITe_Y-9JOXxrQ,4298
+cobweb/db/redis_db.py,sha256=DG-8l5DKRTs2ln1g9SM6gBMkmmjAcCM7RHL84eIuH60,5385
 cobweb/exceptions/__init__.py,sha256=E9SHnJBbhD7fOgPFMswqyOf8SKRDrI_i25L0bSpohvk,32
 cobweb/exceptions/oss_db_exception.py,sha256=iP_AImjNHT3-Iv49zCFQ3rdLnlvuHa3h2BXApgrOYpA,636
 cobweb/launchers/__init__.py,sha256=qMuVlQcjErVK67HyKFZEsXf_rfZD5ODjx1QucSCKMOM,114
-cobweb/launchers/launcher.py,sha256=_qC3EnD_QxQRP_RBNHHJ8HLfn_0FED1jUF_lyas5Hss,7081
+cobweb/launchers/launcher.py,sha256=c2Jo9ppzJwzDONXP3hPaN-_DW58JeMe1HUBGKr9YTag,7797
 cobweb/launchers/launcher_air.py,sha256=KAk_M8F3029cXYe7m4nn3Nzyi89lbxJ2cqZjqW8iZ0E,2832
 cobweb/launchers/launcher_api.py,sha256=7K7Kl3dk7Ung9iRBwhiMrALEJywcR66ie5RIkLQEM-Y,7909
-cobweb/launchers/launcher_pro.py,sha256=QMumHUTi6IudO5mw9SnwlmP8k_BJ50cpNjYjoQv-_YY,7936
+cobweb/launchers/launcher_pro.py,sha256=QCmOzlIDvdfdfZVK7rQN6PYou9Vedepie1aqqeHlI2w,7912
 cobweb/pipelines/__init__.py,sha256=zSUsGtx6smbs2iXBXvYynReKSgky-3gjqaAtKVnA_OU,105
 cobweb/pipelines/pipeline.py,sha256=4TJLX0sUHRxYndF5A4Vs5btUGI-wigkOcFvhTW1hLXI,2009
 cobweb/pipelines/pipeline_console.py,sha256=NEh-4zhuVAQOqwXLsqeb-rcNZ9_KXFUpL3otUTL5qBs,754
@@ -37,8 +37,8 @@ cobweb/utils/bloom.py,sha256=vng-YbKgh9HbtpAWYf_nkUSbfVTOj40aqUUejRYlsCU,1752
 cobweb/utils/dotting.py,sha256=mVICaa26R-dQ4JGmPK-kkR6QjX38QiRewXZnGb2DCIc,1784
 cobweb/utils/oss.py,sha256=gyt8-UB07tVphZLQXMOf-JTJwU-mWq8KZkOXKkAf3uk,3513
 cobweb/utils/tools.py,sha256=5JEaaAwYoV9Sdla2UBIJn6faUBuXmxUMagm9ck6FVqs,1253
-cobweb_launcher-1.2.51.dist-info/LICENSE,sha256=z1rxSIGOyzcSb3orZxFPxzx-0C1vTocmswqBNxpKfEk,1063
-cobweb_launcher-1.2.51.dist-info/METADATA,sha256=xzLg7vLTsWurDo9L8jjmnlq-8B6UE1bT2itXPHt4a8o,6510
-cobweb_launcher-1.2.51.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
-cobweb_launcher-1.2.51.dist-info/top_level.txt,sha256=4GETBGNsKqiCUezmT-mJn7tjhcDlu7nLIV5gGgHBW4I,7
-cobweb_launcher-1.2.51.dist-info/RECORD,,
+cobweb_launcher-1.2.53.dist-info/LICENSE,sha256=z1rxSIGOyzcSb3orZxFPxzx-0C1vTocmswqBNxpKfEk,1063
+cobweb_launcher-1.2.53.dist-info/METADATA,sha256=AwxLfnqtHeoXUJAY7X8yLzZ1lLZr4XxAViYOH6ExClQ,6510
+cobweb_launcher-1.2.53.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
+cobweb_launcher-1.2.53.dist-info/top_level.txt,sha256=4GETBGNsKqiCUezmT-mJn7tjhcDlu7nLIV5gGgHBW4I,7
+cobweb_launcher-1.2.53.dist-info/RECORD,,