cobweb-launcher 3.2.18__py3-none-any.whl → 3.2.20__py3-none-any.whl

cobweb/launchers/distributor.py

@@ -72,7 +72,7 @@ class Distributor(threading.Thread):
 
         elif isinstance(item, Seed):
             # todo: 新种子日志
-            item.seed.params.insert_time = time.time()
+            item.params.insert_time = time.time()
             self.task_queue.add_task(
                 task_id=item.sid, data=item, status=Status.INSERT,
                 priority=item.params.priority, parent_id=task_id

cobweb/schedulers/scheduler_with_redis.py

@@ -140,16 +140,16 @@ class RedisScheduler(Scheduler):
 
             if self.pause.is_set():
                 execute_time = int(time.time()) - start_time
-                if not self.task_model and execute_time > self.before_scheduler_wait_seconds:
-                    logger.info("Done! ready to close thread...")
-                    self.stop.set()
-                elif redis_todo_len:
+                if redis_todo_len and self.task_queue.length() > 0:
                     logger.info(
                         f"Recovery {self.task} task run！"
                         f"Todo seeds count: {redis_todo_len}"
                         f", queue length: {redis_seed_count}"
                     )
                     self.pause.clear()
+                elif not self.task_model and execute_time > self.before_scheduler_wait_seconds:
+                    logger.info("Done! ready to close thread...")
+                    self.stop.set()
                 else:
                     logger.info("Pause! waiting for resume...")
 

{cobweb_launcher-3.2.18.dist-info → cobweb_launcher-3.2.20.dist-info}/METADATA

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

{cobweb_launcher-3.2.18.dist-info → cobweb_launcher-3.2.20.dist-info}/RECORD

@@ -18,7 +18,7 @@ cobweb/db/redis_db.py,sha256=X7dUpW50QcmRPjYlYg7b-fXF_fcjuRRk3DBx2ggetXk,7687
 cobweb/exceptions/__init__.py,sha256=E9SHnJBbhD7fOgPFMswqyOf8SKRDrI_i25L0bSpohvk,32
 cobweb/exceptions/oss_db_exception.py,sha256=iP_AImjNHT3-Iv49zCFQ3rdLnlvuHa3h2BXApgrOYpA,636
 cobweb/launchers/__init__.py,sha256=6_v2jd2sgj6YnOB1nPKiYBskuXVb5xpQnq2YaDGJgQ8,100
-cobweb/launchers/distributor.py,sha256=Ay44iPDNOlrZIW1wgNa4aijRNZsuLLfBz-QlFYXEKDs,5667
+cobweb/launchers/distributor.py,sha256=1ooOFqWqZLCn7zIDoraDDGJm9l7aAWzygz-UNUSqxpI,5662
 cobweb/launchers/launcher.py,sha256=Shb6o6MAM38d32ybW2gY6qpGmhuiV7jo9TDh0f7rud8,5694
 cobweb/launchers/uploader.py,sha256=QwJOmG7jq2T5sRzrT386zJ0YYNz-hAv0i6GOpoEaRdU,2075
 cobweb/log_dots/__init__.py,sha256=F-3sNXac5uI80j-tNFGPv0lygy00uEI9XfFvK178RC4,55
@@ -30,15 +30,15 @@ cobweb/pipelines/pipeline_csv.py,sha256=TFqxqgVUqkBF6Jott4zd6fvCSxzG67lpafRQtXPw
 cobweb/pipelines/pipeline_loghub.py,sha256=zwIa_pcWBB2UNGd32Cu-i1jKGNruTbo2STdxl1WGwZ0,1829
 cobweb/schedulers/__init__.py,sha256=LEya11fdAv0X28YzbQTeC1LQZ156Fj4cyEMGqQHUWW0,49
 cobweb/schedulers/scheduler.py,sha256=Of-BjbBh679R6glc12Kc8iugeERCSusP7jolpCc1UMI,1740
-cobweb/schedulers/scheduler_with_redis.py,sha256=iaImkTldr203Xm5kbBWPJ2fLUUe2mgcmUoDUQYfn5iM,7370
+cobweb/schedulers/scheduler_with_redis.py,sha256=yz6anTM3eNOQRP5WtlY1Kx6KaVgKgyR_FwvXtlydGqQ,7403
 cobweb/utils/__init__.py,sha256=HV0rDW6PVpIVmN_bKquKufli15zuk50tw1ZZejyZ4Pc,173
 cobweb/utils/bloom.py,sha256=A8xqtHXp7jgRoBuUlpovmq8lhU5y7IEF0FOCjfQDb6s,1855
 cobweb/utils/decorators.py,sha256=ZwVQlz-lYHgXgKf9KRCp15EWPzTDdhoikYUNUCIqNeM,1140
 cobweb/utils/dotting.py,sha256=e0pLEWB8sly1xvXOmJ_uHGQ6Bbw3O9tLcmUBfyNKRmQ,10633
 cobweb/utils/oss.py,sha256=wmToIIVNO8nCQVRmreVaZejk01aCWS35e1NV6cr0yGI,4192
 cobweb/utils/tools.py,sha256=14TCedqt07m4z6bCnFAsITOFixeGr8V3aOKk--L7Cr0,879
-cobweb_launcher-3.2.18.dist-info/LICENSE,sha256=z1rxSIGOyzcSb3orZxFPxzx-0C1vTocmswqBNxpKfEk,1063
-cobweb_launcher-3.2.18.dist-info/METADATA,sha256=bdZ30kO73t3cqozkOyfhr0iEmrDDxPxiqVR9J3oITbE,6115
-cobweb_launcher-3.2.18.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-cobweb_launcher-3.2.18.dist-info/top_level.txt,sha256=4GETBGNsKqiCUezmT-mJn7tjhcDlu7nLIV5gGgHBW4I,7
-cobweb_launcher-3.2.18.dist-info/RECORD,,
+cobweb_launcher-3.2.20.dist-info/LICENSE,sha256=z1rxSIGOyzcSb3orZxFPxzx-0C1vTocmswqBNxpKfEk,1063
+cobweb_launcher-3.2.20.dist-info/METADATA,sha256=GrOWnfJGxsO3LPt3_xWpb2ySDzRrupBYngzOpZ7NSPs,6115
+cobweb_launcher-3.2.20.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cobweb_launcher-3.2.20.dist-info/top_level.txt,sha256=4GETBGNsKqiCUezmT-mJn7tjhcDlu7nLIV5gGgHBW4I,7
+cobweb_launcher-3.2.20.dist-info/RECORD,,