mdbq 4.2.13__py3-none-any.whl → 4.2.14__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.2.13'
+VERSION = '4.2.14'

mdbq/route/monitor.py

@@ -929,7 +929,7 @@ class RouteMonitor:
         """
         从 Redis 队列中消费任务并写入数据库（用于单独的消费者进程）
         
-        这个方法应该在单独的进程中循环调用，不要在 uwsgi worker 中调用！
+        这个方法应该在单独的进程中循环调用
         
         Args:
             batch_size: 每次处理的最大任务数

{mdbq-4.2.13.dist-info → mdbq-4.2.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mdbq
-Version: 4.2.13
+Version: 4.2.14
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-4.2.13.dist-info → mdbq-4.2.14.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=zsZCfTo9vIRDK8zLekhuOsr5TmqS2lKNUNy9gK21dI0,18
+mdbq/__version__.py,sha256=cr0O8LE2OkusCNWIOsW9RXnz5146D47fEK2fLTbqnUU,18
 mdbq/auth/__init__.py,sha256=pnPMAt63sh1B6kEvmutUuro46zVf2v2YDAG7q-jV_To,24
 mdbq/auth/auth_backend.py,sha256=iLN7AqiSq7fQgFtNtge_TIlVOR1hrCSZXH6oId6uGX4,116924
 mdbq/auth/crypto.py,sha256=M0i4dRljJuE30WH_13ythA2QGKPXZm6TgpnYp6aHOzw,17431
@@ -30,13 +30,12 @@ mdbq/redis/getredis.py,sha256=vdg7YQEjhoMp5QzxygNGx5DQKRnePrcwPYgUrDypA6g,23672
 mdbq/redis/redis_cache.py,sha256=JWarX_l7LvdKyxtUNPANAqd-y20Jg5uqmllCbT-fyv8,45752
 mdbq/route/__init__.py,sha256=BT_dAY7V-U2o72bevq1B9Mq9QA7GodwtkxyLNdGaoE8,22
 mdbq/route/analytics.py,sha256=dngj5hVwKddEUy59nSYbOoJ9C7OVrtCmCkvW6Uj9RYM,28097
-mdbq/route/monitor.py,sha256=k78g1NDBpftoOJl2rxaw-OoGQPAahI7feQ5C8XENiyo,40776
-mdbq/route/monitor_worker.py,sha256=HlMr9s1mcYaomTLY_-vimAm5xK9hBWkR68JFNjLcr0c,4104
+mdbq/route/monitor.py,sha256=mY55Y2m0c_1fmC2A6GNWvkSbW3OsXPs3jOI-9HHTYMw,40738
 mdbq/route/routes.py,sha256=QVGfTvDgu0CpcKCvk1ra74H8uojgqTLUav1fnVAqLEA,29433
 mdbq/selenium/__init__.py,sha256=AKzeEceqZyvqn2dEDoJSzDQnbuENkJSHAlbHAD0u0ZI,10
 mdbq/selenium/get_driver.py,sha256=1NTlVUE6QsyjTrVVVqTO2LOnYf578ccFWlWnvIXGtic,20903
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-4.2.13.dist-info/METADATA,sha256=vRP7TVDetxdHucimnQ98E_rMf7ceAVjj4d2OGpMvhTY,364
-mdbq-4.2.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mdbq-4.2.13.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.2.13.dist-info/RECORD,,
+mdbq-4.2.14.dist-info/METADATA,sha256=aNX05FUtA3v3lVAh0N2n7q8Wp-usLo5yXiL4H5qN9Lc,364
+mdbq-4.2.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mdbq-4.2.14.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.2.14.dist-info/RECORD,,

mdbq/route/monitor_worker.py

@@ -1,152 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
-API 监控系统 - 队列消费者进程
-
-这是一个单独运行的守护进程，从 Redis 队列中消费监控任务并写入数据库。
-在 uwsgi 多进程环境下，只需运行一个或多个此进程即可处理所有 worker 的监控数据。
-
-使用方法：
-    python -m mdbq.route.monitor_worker
-    
-或通过 systemd/supervisor 管理：
-    supervisorctl start api_monitor_worker
-"""
-
-import os
-import sys
-import time
-import signal
-from typing import Optional
-
-
-class MonitorWorker:
-    """监控任务队列消费者"""
-    
-    def __init__(self, redis_client, database: str = 'api监控系统', pool=None):
-        """
-        初始化消费者
-        
-        Args:
-            redis_client: Redis 客户端实例
-            database: 监控数据库名称
-            pool: 数据库连接池（可选）
-        """
-        from mdbq.route.monitor import RouteMonitor
-        
-        self.monitor = RouteMonitor(
-            database=database,
-            pool=pool,
-            redis_client=redis_client,
-            enable_async=True
-        )
-        self.running = True
-        self.processed_total = 0
-        
-        # 注册信号处理
-        signal.signal(signal.SIGINT, self._handle_signal)
-        signal.signal(signal.SIGTERM, self._handle_signal)
-    
-    def _handle_signal(self, signum, frame):
-        """处理关闭信号"""
-        self.running = False
-    
-    def run(self, batch_size: int = 100, sleep_interval: float = 0.1):
-        """
-        运行消费者主循环
-        
-        Args:
-            batch_size: 每次处理的最大任务数
-            sleep_interval: 队列为空时的休眠间隔（秒）
-        """
-        last_log_time = time.time()
-        log_interval = 60  # 每60秒输出一次统计
-        
-        try:
-            while self.running:
-                # 消费一批任务
-                processed = self.monitor.consume_queue_tasks(
-                    batch_size=batch_size,
-                    timeout=1.0
-                )
-                
-                self.processed_total += processed
-                
-                # 定期输出统计信息
-                current_time = time.time()
-                if current_time - last_log_time >= log_interval:
-                    last_log_time = current_time
-                
-                # 如果队列为空，短暂休眠
-                if processed == 0:
-                    time.sleep(sleep_interval)
-        
-        except Exception as e:
-            pass
-
-
-def create_worker_from_config(config_file: Optional[str] = None):
-    """
-    从配置文件创建消费者实例
-    
-    Args:
-        config_file: 配置文件路径（可选，默认 ~/spd.txt）
-    
-    Returns:
-        MonitorWorker: 消费者实例
-    """
-    try:
-        import redis
-        from mdbq.myconf import myconf
-        
-        # 读取配置
-        if config_file is None:
-            config_file = os.path.join(os.path.expanduser("~"), 'spd.txt')
-        
-        parser = myconf.ConfigParser()
-        redis_password = parser.get_value(
-            file_path=config_file,
-            section='redis',
-            key='password',
-            value_type=str
-        )
-        
-        # 创建 Redis 客户端
-        redis_client = redis.Redis(
-            host='127.0.0.1',
-            port=6379,
-            db=0,
-            password=redis_password,
-            decode_responses=False,
-            socket_timeout=5,
-            socket_connect_timeout=3
-        )
-        
-        # 创建消费者
-        worker = MonitorWorker(
-            redis_client=redis_client,
-            database='api监控系统'
-        )
-        
-        return worker
-        
-    except Exception as e:
-        sys.exit(1)
-
-
-def main():
-    """主函数"""
-    
-    # 创建消费者
-    worker = create_worker_from_config()
-    
-    # 运行消费者
-    worker.run(
-        batch_size=100,      # 每次处理100个任务
-        sleep_interval=0.5   # 队列空时休眠0.5秒
-    )
-
-
-if __name__ == '__main__':
-    main()
-