Merge pull request #26 from GitTimeraider/develop

Develop to main

Author: GitTimeraider

app/currency.py

@@ -122,7 +122,7 @@ def get_exchange_rates(self, base_currency: str = 'EUR', force_refresh: bool = F
 
     def _fetch_frankfurter(self):
         url = 'https://api.frankfurter.app/latest?from=EUR'
-        r = requests.get(url, timeout=5)  # Reduced timeout from 10 to 5 seconds
+        r = requests.get(url, timeout=3)  # Further reduced timeout from 5 to 3 seconds
         r.raise_for_status()
         data = r.json()
         rates = data.get('rates') or {}
@@ -135,7 +135,7 @@ def _fetch_frankfurter(self):
         return out
 
     def _fetch_floatrates(self):
-        r = requests.get(FLOATRATES_URL, timeout=5)  # Reduced timeout from 10 to 5 seconds
+        r = requests.get(FLOATRATES_URL, timeout=3)  # Further reduced timeout from 5 to 3 seconds
         r.raise_for_status()
         data = r.json()  # keys are lowercase currency codes
         out = {'EUR': Decimal('1')}
@@ -151,7 +151,7 @@ def _fetch_floatrates(self):
         return out
 
     def _fetch_erapi_open(self):
-        r = requests.get(ERAPI_URL, timeout=5)  # Reduced timeout from 10 to 5 seconds
+        r = requests.get(ERAPI_URL, timeout=3)  # Further reduced timeout from 5 to 3 seconds
         r.raise_for_status()
         data = r.json()
         if data.get('result') != 'success':

app/email.py

@@ -6,6 +6,8 @@
 from app import db
 from apscheduler.schedulers.background import BackgroundScheduler
 import atexit
+import threading
+import time
 
 def get_currency_symbol(currency_code):
     """Get currency symbol for display"""
@@ -188,15 +190,17 @@ def send_expiry_notification(app, user, subscriptions):
             # Log connection attempt
             print(f"🔌 Connecting to {app.config['MAIL_SERVER']}:{app.config['MAIL_PORT']}")
 
-            # Use SSL for port 465, TLS for other ports
+            # Use SSL for port 465, TLS for other ports with timeout
+            smtp_timeout = 10  # 10 second timeout for SMTP operations
+            
             if app.config['MAIL_PORT'] == 465:
                 # Port 465 uses implicit SSL
                 print("🔒 Using SSL connection (port 465)")
-                server = smtplib.SMTP_SSL(app.config['MAIL_SERVER'], app.config['MAIL_PORT'])
+                server = smtplib.SMTP_SSL(app.config['MAIL_SERVER'], app.config['MAIL_PORT'], timeout=smtp_timeout)
             else:
                 # Other ports use explicit TLS or plain connection
                 print(f"🔐 Using {'TLS' if app.config['MAIL_USE_TLS'] else 'plain'} connection")
-                server = smtplib.SMTP(app.config['MAIL_SERVER'], app.config['MAIL_PORT'])
+                server = smtplib.SMTP(app.config['MAIL_SERVER'], app.config['MAIL_PORT'], timeout=smtp_timeout)
                 if app.config['MAIL_USE_TLS']:
                     server.starttls()
 
@@ -217,13 +221,45 @@ def send_expiry_notification(app, user, subscriptions):
             print(f"❌ SMTP Connection failed for {user.username}: {e}")
             print("🔍 Check MAIL_SERVER and MAIL_PORT")
             return False
+        except smtplib.SMTPServerDisconnected as e:
+            print(f"❌ SMTP Server disconnected for {user.username}: {e}")
+            print("🔍 Mail server may be overloaded or timing out")
+            return False
         except smtplib.SMTPException as e:
             print(f"❌ SMTP error for {user.username}: {e}")
             return False
+        except ConnectionError as e:
+            print(f"❌ Network connection error for {user.username}: {e}")
+            print("🔍 Check network connectivity to mail server")
+            return False
+        except TimeoutError as e:
+            print(f"❌ Timeout error for {user.username}: {e}")
+            print("🔍 Mail server is taking too long to respond")
+            return False
         except Exception as e:
             print(f"❌ Failed to send email to {user.username}: {e}")
             return False
 
+def check_expiring_subscriptions_with_timeout(app):
+    """Wrapper function to check expiring subscriptions with timeout protection"""
+    def run_check():
+        try:
+            check_expiring_subscriptions(app)
+        except Exception as e:
+            print(f"❌ Error in notification check: {e}")
+    
+    # Run the check in a separate thread with timeout
+    thread = threading.Thread(target=run_check)
+    thread.daemon = True
+    thread.start()
+    
+    # Wait for completion with timeout
+    thread.join(timeout=60)  # 60 second timeout for entire email check process
+    
+    if thread.is_alive():
+        print("⚠️ Email notification check timed out after 60 seconds")
+        # Thread will continue in background but won't block the scheduler
+
 def check_expiring_subscriptions(app):
     """Check for expiring subscriptions and send notifications"""
     with app.app_context():
@@ -310,11 +346,12 @@ def start_scheduler(app):
 
     # Check every hour to respect user-specific notification times
     scheduler.add_job(
-        func=lambda: check_expiring_subscriptions(app),
+        func=lambda: check_expiring_subscriptions_with_timeout(app),
         trigger="interval",
         hours=1,
         id='check_subscriptions',
-        replace_existing=True
+        replace_existing=True,
+        max_instances=1  # Prevent overlapping runs
     )
 
     scheduler.start()
@@ -422,15 +459,17 @@ def send_test_email(app, user):
             # Log connection attempt
             print(f"🔌 Connecting to {app.config['MAIL_SERVER']}:{app.config['MAIL_PORT']}")
 
-            # Use SSL for port 465, TLS for other ports
+            # Use SSL for port 465, TLS for other ports with timeout
+            smtp_timeout = 10  # 10 second timeout for SMTP operations
+            
             if app.config['MAIL_PORT'] == 465:
                 # Port 465 uses implicit SSL
                 print("🔒 Using SSL connection (port 465)")
-                server = smtplib.SMTP_SSL(app.config['MAIL_SERVER'], app.config['MAIL_PORT'])
+                server = smtplib.SMTP_SSL(app.config['MAIL_SERVER'], app.config['MAIL_PORT'], timeout=smtp_timeout)
             else:
                 # Other ports use explicit TLS or plain connection
                 print(f"🔐 Using {'TLS' if app.config['MAIL_USE_TLS'] else 'plain'} connection")
-                server = smtplib.SMTP(app.config['MAIL_SERVER'], app.config['MAIL_PORT'])
+                server = smtplib.SMTP(app.config['MAIL_SERVER'], app.config['MAIL_PORT'], timeout=smtp_timeout)
                 if app.config['MAIL_USE_TLS']:
                     server.starttls()
 
@@ -460,13 +499,34 @@ def send_test_email(app, user):
                 'success': False,
                 'message': error_msg
             }
+        except smtplib.SMTPServerDisconnected as e:
+            error_msg = f"Mail server disconnected: {e}. Server may be overloaded."
+            print(f"❌ {error_msg}")
+            return {
+                'success': False,
+                'message': error_msg
+            }
         except smtplib.SMTPRecipientsRefused as e:
             error_msg = f"Recipient refused: {e}. Check email address."
             print(f"❌ {error_msg}")
             return {
                 'success': False,
                 'message': error_msg
             }
+        except ConnectionError as e:
+            error_msg = f"Network connection error: {e}. Check network connectivity."
+            print(f"❌ {error_msg}")
+            return {
+                'success': False,
+                'message': error_msg
+            }
+        except TimeoutError as e:
+            error_msg = f"Connection timeout: {e}. Mail server is taking too long to respond."
+            print(f"❌ {error_msg}")
+            return {
+                'success': False,
+                'message': error_msg
+            }
         except Exception as e:
             error_msg = f"Unexpected error: {e}"
             print(f"❌ {error_msg}")

config.py

@@ -8,11 +8,11 @@ class Config:
 
     # Database connection pool settings for SQLite
     SQLALCHEMY_ENGINE_OPTIONS = {
-        'pool_timeout': 20,
+        'pool_timeout': 10,  # Reduced from 20 to 10 seconds
         'pool_recycle': 3600,
         'pool_pre_ping': True,
         'connect_args': {
-            'timeout': 30,
+            'timeout': 20,  # Reduced from 30 to 20 seconds
             'check_same_thread': False
         } if 'sqlite' in (os.environ.get('DATABASE_URL') or 'sqlite:///subscriptions.db') else {}
     }

docker-compose.yml

@@ -16,5 +16,9 @@ services:
       - DAYS_BEFORE_EXPIRY=${DAYS_BEFORE_EXPIRY}
       - PUID=${PUID:-1000}
       - PGID=${PGID:-1000}
+      # Timeout optimization settings
+      - CURRENCY_REFRESH_MINUTES=${CURRENCY_REFRESH_MINUTES:-1440}
+      - CURRENCY_PROVIDER_PRIORITY=${CURRENCY_PROVIDER_PRIORITY:-frankfurter,floatrates,erapi_open}
+      - PERFORMANCE_LOGGING=${PERFORMANCE_LOGGING:-true}
     volumes:
       - ./data:/app/instance

gunicorn.conf.py

@@ -5,14 +5,14 @@
 backlog = 2048
 
 # Worker processes
-workers = 2
+workers = 3  # Increased from 2 to 3 for better load distribution
 worker_class = "sync"
 worker_connections = 1000
-timeout = 60  # Increased from default 30s to 60s
+timeout = 120  # Increased from 60s to 120s for longer operations
 keepalive = 2
 
 # Restart workers after this many requests, to help prevent memory leaks
-max_requests = 1000
+max_requests = 500  # Reduced from 1000 to prevent memory buildup
 max_requests_jitter = 50
 
 # Logging
@@ -36,9 +36,13 @@
 certfile = None
 
 # Worker timeout
-graceful_timeout = 30
+graceful_timeout = 60  # Increased from 30s to 60s
 worker_tmp_dir = "/dev/shm"
 
+# Additional timeout settings for better stability
+worker_timeout = 120  # Same as timeout
+worker_max_requests_jitter = 50
+
 # Environment
 raw_env = [
     'FLASK_ENV=production',