Skip to content

Conversation

@NeatGuyCoding
Copy link
Contributor

Important

  1. Make sure you have read our contribution guidelines
  2. Ensure there is an associated issue and you have been assigned to it
  3. Use the correct syntax to link this PR: Fixes #<issue number>.

Summary

fix: add exception handling to Redis subscription listener for resource cleanup

Screenshots

Before After
... ...

Checklist

  • This change requires a documentation update, included: Dify Document
  • I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!)
  • I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change.
  • I've updated the documentation accordingly.
  • I ran dev/reformat(backend) and cd web && npx lint-staged(frontend) to appease the lint gods

Copilot AI review requested due to automatic review settings November 22, 2025 12:48
@dosubot dosubot bot added the size:M This PR changes 30-99 lines, ignoring generated files. label Nov 22, 2025
@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @NeatGuyCoding, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request enhances the stability of the Redis broadcast channel subscription mechanism by introducing comprehensive exception handling. It guarantees that Redis PubSub resources are properly unsubscribed and closed, even if unforeseen errors occur during message reception or processing, thereby preventing potential resource leaks and improving the overall resilience of the system.

Highlights

  • Robust Error Handling: Implemented a try...except...finally block around the Redis subscription listener's main loop to catch and log unexpected exceptions during message processing.
  • Guaranteed Resource Cleanup: Ensured that _unsubscribe() and pubsub.close() are always called in the finally block, preventing resource leaks even if errors occur.
  • Improved Logging: Added detailed logging for exceptions within the listener thread and for the successful or failed cleanup of Redis resources.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces crucial exception handling to the Redis subscription listener, ensuring robust resource cleanup even when errors occur. The use of a try...finally block around the listener loop and individual try...except blocks for cleanup operations is a solid approach to improve reliability. I have one suggestion to simplify the cleanup logic slightly for better readability.

Comment on lines +119 to +130
try:
pubsub.close()
_logger.debug("%s PubSub closed for topic %s", self._get_subscription_type().title(), self._topic)
except Exception as e:
_logger.warning(
"Error closing PubSub for %s channel %s: %s",
self._get_subscription_type(),
self._topic,
type(payload_bytes),
e,
)
continue

self._enqueue_message(payload_bytes)

_logger.debug("%s listener thread stopped for channel %s", self._get_subscription_type().title(), self._topic)
self._unsubscribe()
pubsub.close()
_logger.debug("%s PubSub closed for topic %s", self._get_subscription_type().title(), self._topic)
self._pubsub = None
finally:
self._pubsub = None
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The nested finally block is not necessary here. Execution will proceed to the line after the try...except block regardless of whether an exception was caught. You can simplify the code and improve readability by removing the finally statement and un-indenting self._pubsub = None.

            try:
                pubsub.close()
                _logger.debug("%s PubSub closed for topic %s", self._get_subscription_type().title(), self._topic)
            except Exception as e:
                _logger.warning(
                    "Error closing PubSub for %s channel %s: %s",
                    self._get_subscription_type(),
                    self._topic,
                    e,
                )
            self._pubsub = None

Copilot finished reviewing on behalf of NeatGuyCoding November 22, 2025 12:51
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR adds comprehensive exception handling and resource cleanup to the Redis subscription listener to prevent resource leaks when errors occur during message processing or cleanup operations.

Key changes:

  • Wraps the main message processing loop in a try-except block to catch and log unexpected errors
  • Moves resource cleanup operations (unsubscribe and pubsub close) into a finally block to ensure they always execute
  • Wraps individual cleanup operations in separate try-except blocks to prevent one failing cleanup from blocking others
  • Uses a nested finally block to guarantee _pubsub is always set to None, even if cleanup operations fail

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

"Received invalid data from %s channel %s, type=%s",
try:
pubsub.close()
_logger.debug("%s PubSub closed for topic %s", self._get_subscription_type().title(), self._topic)
Copy link

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inconsistent terminology in log message. This message uses "for topic %s" while all other log messages in this file use "channel" (e.g., lines 108, 115, 125: "for channel %s").

Consider changing to:

_logger.debug("%s PubSub closed for channel %s", self._get_subscription_type().title(), self._topic)

This would make the terminology consistent throughout the file.

Suggested change
_logger.debug("%s PubSub closed for topic %s", self._get_subscription_type().title(), self._topic)
_logger.debug("%s PubSub closed for channel %s", self._get_subscription_type().title(), self._topic)

Copilot uses AI. Check for mistakes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M This PR changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant