Add Timeout Exception Fix: Workers keep getting killed #16

pyproject.toml

@@ -18,6 +18,7 @@ flask-session = "^0.8.0"
 flask-sqlalchemy = "^3.1.1"
 orjson = "^3.10.4"
 stackprinter = "^0.2.12"
+timeout-decorator = "^0.5.0"
 
 
 [build-system]

ygg_rss_proxy/app.py

@@ -1,6 +1,7 @@
 from flask import Flask, request, jsonify, Response
 from flask_session import Session
 from flask_sqlalchemy import SQLAlchemy
+from timeout_decorator import TimeoutError
 from ygg_rss_proxy.rss import get_rss_feed, replace_torrent_links
 from ygg_rss_proxy.settings import settings
 from ygg_rss_proxy.logging_config import logger
@@ -40,7 +41,10 @@ def proxy_rss():
     query_params = request.query_string.decode("utf-8")
     ygg_session = get_session()
 
-    response = get_rss_feed(query_params, requests_session=ygg_session)
+    try:
+        response = get_rss_feed(query_params, requests_session=ygg_session)
+    except TimeoutError as e:
+        logger.error(f"Timeout Err: {e}")
 
     if response.status_code in [401, 403, 307, 301]:
         # Session may have expired, re-authenticate and retry the request

ygg_rss_proxy/auth.py

@@ -1,4 +1,5 @@
 import requests
+import timeout_decorator
 from ygg_rss_proxy.fspy import FlareSolverr
 from ygg_rss_proxy.settings import settings
 from ygg_rss_proxy.logging_config import logger
@@ -126,7 +127,7 @@ def ygg_cloudflare_login(
         )
         raise Exception("Failed to authenticate to YGG")
 
-
+@timeout_decorator.timeout(90, exception_message=f"Timeout after 90 seconds")
 def ygg_login(
     session=requests.Session(), ygg_playload: dict = ygg_playload
 ) -> requests.Session:

ygg_rss_proxy/rss.py

@@ -2,19 +2,22 @@
 from lxml import etree
 from ygg_rss_proxy.settings import settings
 import requests
+import timeout_decorator
 
 # URLs
 URL_RSS: str = f"{settings.ygg_url}/rss"
 URL_TORRENTS: str = f"{settings.ygg_url}/rss/download"
 URL_PROXY = f"{settings.rss_shema}://{settings.rss_host}:{settings.rss_port}"
 
 
+@timeout_decorator.timeout(30, exception_message=f"Timeout after 30 seconds")
 def get_rss_feed(query_params, requests_session: requests.Session) -> requests.Response:
     rss_url_with_params = f"{URL_RSS}?{query_params}"
     response = requests_session.get(rss_url_with_params)
     return response
 
 
+@timeout_decorator.timeout(30, exception_message=f"Timeout after 30 seconds")
 def replace_torrent_links(rss_content) -> Any:
     parser = etree.XMLParser(recover=True)
     tree = etree.fromstring(rss_content, parser)

ygg_rss_proxy/session_manager.py

@@ -2,10 +2,12 @@
 import pickle
 from flask import session
 from sqlalchemy import text
+import timeout_decorator
 from requests.utils import dict_from_cookiejar, cookiejar_from_dict
 from ygg_rss_proxy.auth import ygg_login
 from ygg_rss_proxy.logging_config import logger
 
+@timeout_decorator.timeout(3, exception_message=f"Timeout after 3 seconds")
 def check_database_connection():
     from ygg_rss_proxy.app import db
     try:
@@ -44,7 +46,7 @@ def init_session() -> None:
     if "session_data" not in session:
         new_session()
 
-
+@timeout_decorator.timeout(90, exception_message=f"Timeout after 90 seconds")
 def get_session() -> requests.Session:
     """
     This function retrieves a session by checking if session data exists.