定时任务增加redis连接

app/redis_lock.py

@@ -1,5 +1,4 @@
-import redis.asyncio as redis
-import asyncio
+import redis
 import uuid
 from typing import Optional
 from app.config import settings
@@ -9,6 +8,7 @@ logger = get_redis_logger()
 
 
 class RedisLock:
+    """Redis分布式锁"""
     def __init__(self, redis_client: redis.Redis, key: str, timeout: int = None):
         self.redis_client = redis_client
         self.key = f"lock:{key}"
@@ -16,7 +16,7 @@ class RedisLock:
         self.identifier = str(uuid.uuid4())
         self.acquired = False
 
-    async def acquire(self) -> bool:
+    def acquire(self, blocking: bool = True, timeout: int = None) -> bool:
         """获取分布式锁"""
         logger.debug(f"🔒 尝试获取Redis锁: {self.key}")
         
@@ -28,7 +28,7 @@ class RedisLock:
         end
         """
         
-        result = await self.redis_client.eval(
+        result = self.redis_client.eval(
             lua_script,
             1,
             self.key,
@@ -44,7 +44,7 @@ class RedisLock:
         
         return self.acquired
 
-    async def release(self) -> bool:
+    def release(self) -> bool:
         """释放分布式锁"""
         if not self.acquired:
             return False
@@ -57,7 +57,7 @@ class RedisLock:
         end
         """
         
-        result = await self.redis_client.eval(
+        result = self.redis_client.eval(
             lua_script,
             1,
             self.key,
@@ -67,39 +67,58 @@ class RedisLock:
         self.acquired = False
         return bool(result)
 
-    async def __aenter__(self):
-        """异步上下文管理器入口"""
+    def __enter__(self):
+        """同步上下文管理器入口"""
         retries = 0
         while retries < settings.redis_lock_max_retries:
-            if await self.acquire():
+            if self.acquire(blocking=False):
                 return self
-            await asyncio.sleep(settings.redis_lock_retry_delay)
+            import time
+            time.sleep(settings.redis_lock_retry_delay)
             retries += 1
         
         raise TimeoutError(f"Failed to acquire lock {self.key} after {retries} retries")
 
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        """异步上下文管理器出口"""
-        await self.release()
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        """同步上下文管理器出口"""
+        self.release()
 
 
 class RedisManager:
     def __init__(self):
         self.redis_client: Optional[redis.Redis] = None
 
-    async def connect(self):
-        """连接Redis"""
-        self.redis_client = redis.from_url(
-            settings.redis_url,
-            encoding="utf-8",
-            decode_responses=True
-        )
-        await self.redis_client.ping()
+    def connect(self) -> bool:
+        """连接Redis
+        
+        Returns:
+            bool: 连接是否成功
+        """
+        try:
+            logger.info(f"🔴 正在连接Redis: {settings.redis_url}")
+            self.redis_client = redis.from_url(
+                settings.redis_url,
+                encoding="utf-8",
+                decode_responses=True,
+                socket_connect_timeout=5,
+                socket_timeout=5,
+                retry_on_timeout=True
+            )
+            result = self.redis_client.ping()
+            if result:
+                logger.info("✅ Redis连接成功")
+                return True
+            else:
+                logger.error("❌ Redis ping失败")
+                return False
+        except Exception as e:
+            logger.error(f"❌ Redis连接失败: {e}")
+            return False
 
-    async def disconnect(self):
+    def disconnect(self):
         """断开Redis连接"""
         if self.redis_client:
-            await self.redis_client.close()
+            self.redis_client.close()
 
     def create_lock(self, key: str, timeout: int = None) -> RedisLock:
         """创建分布式锁"""