pacnpal/Pac-cogs
1
0
Fork 0
mirror of https://github.com/pacnpal/Pac-cogs.git synced 2025-12-23 04:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Eliminating duplicate queue processing that was causing race conditions

Browse Source 
Adding proper processing state tracking and timing
Implementing more aggressive monitoring (1-minute intervals)
Adding activity tracking to detect and recover from hung states
Improving error handling and logging throughout the system
Reducing timeouts and deadlock thresholds for faster recovery
This commit is contained in:
pacnpal
2024-11-15 22:38:36 +00:00
parent 73364e7438
commit 512dd1ff88
6 changed files with 220 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
videoarchiver/processor/core.py
View File

@@ -43,14 +43,10 @@ class VideoProcessor:
if self.db:
self.queue_handler.db = self.db
# Start queue processing
logger.info("Starting video processing queue...")
# Store queue task reference but don't start processing here
# Queue processing is managed by VideoArchiver class
self._queue_task = None
if queue_manager:
self._queue_task = self.bot.loop.create_task(
queue_manager.process_queue(self.queue_handler.process_video)
)
logger.info("Video processing queue started successfully")
logger.info("VideoProcessor initialized successfully")
async def process_message(self, message: discord.Message) -> None:
"""Process a message for video content"""
@@ -74,7 +70,7 @@ class VideoProcessor:
except Exception as e:
logger.error(f"Error cleaning up FFmpeg manager: {e}")
# Cancel queue processing task
# Cancel queue processing task if we have one
if self._queue_task and not self._queue_task.done():
self._queue_task.cancel()
try:

23
videoarchiver/processor/queue_handler.py
View File

@@ -35,6 +35,10 @@ class QueueHandler:
download_task = None
try:
# Start processing
item.start_processing()
logger.info(f"Started processing video: {item.url}")
# Check if video is already archived
if self.db and self.db.is_url_archived(item.url):
logger.info(f"Video already archived: {item.url}")
@@ -43,18 +47,23 @@ class QueueHandler:
archived_info = self.db.get_archived_video(item.url)
if archived_info:
await original_message.reply(f"This video was already archived. You can find it here: {archived_info[0]}")
item.finish_processing(True)
return True, None
guild_id = item.guild_id
if guild_id not in self.components:
return False, f"No components found for guild {guild_id}"
error = f"No components found for guild {guild_id}"
item.finish_processing(False, error)
return False, error
components = self.components[guild_id]
downloader = components.get("downloader")
message_manager = components.get("message_manager")
if not downloader or not message_manager:
return False, f"Missing required components for guild {guild_id}"
error = f"Missing required components for guild {guild_id}"
item.finish_processing(False, error)
return False, error
# Get original message and update reactions
original_message = await self._get_original_message(item)
@@ -74,19 +83,21 @@ class QueueHandler:
if original_message:
await original_message.add_reaction(REACTIONS["error"])
logger.error(f"Download failed for message {item.message_id}: {error}")
item.finish_processing(False, f"Failed to download video: {error}")
return False, f"Failed to download video: {error}"
# Archive video
success, error = await self._archive_video(
guild_id, original_message, message_manager, item.url, file_path
)
if not success:
return False, error
return True, None
# Finish processing
item.finish_processing(success, error if not success else None)
return success, error
except Exception as e:
logger.error(f"Error processing video: {str(e)}", exc_info=True)
item.finish_processing(False, str(e))
return False, str(e)
finally:
# Clean up downloaded file