lizenzserver API gedöns

v2_adminpanel/scheduler.py

@@ -5,6 +5,7 @@ import logging
 from apscheduler.schedulers.background import BackgroundScheduler
 import config
 from utils.backup import create_backup
+from utils.db_utils import get_connection
 
 
 def scheduled_backup():
@@ -13,6 +14,56 @@ def scheduled_backup():
     create_backup(backup_type="scheduled", created_by="scheduler")
 
 
+def cleanup_expired_sessions():
+    """Clean up expired license sessions"""
+    try:
+        conn = get_connection()
+        cur = conn.cursor()
+        
+        # Get client config for timeout value
+        cur.execute("""
+            SELECT session_timeout 
+            FROM client_configs 
+            WHERE client_name = 'Account Forger'
+        """)
+        result = cur.fetchone()
+        timeout_seconds = result[0] if result else 60
+        
+        # Find expired sessions
+        cur.execute("""
+            SELECT id, license_id, hardware_id, ip_address, client_version, started_at
+            FROM license_sessions
+            WHERE last_heartbeat < CURRENT_TIMESTAMP - INTERVAL '%s seconds'
+        """, (timeout_seconds,))
+        
+        expired_sessions = cur.fetchall()
+        
+        if expired_sessions:
+            logging.info(f"Found {len(expired_sessions)} expired sessions to clean up")
+            
+            for session in expired_sessions:
+                # Log to history
+                cur.execute("""
+                    INSERT INTO session_history 
+                    (license_id, hardware_id, ip_address, client_version, started_at, ended_at, end_reason)
+                    VALUES (%s, %s, %s, %s, %s, CURRENT_TIMESTAMP, 'timeout')
+                """, (session[1], session[2], session[3], session[4], session[5]))
+                
+                # Delete session
+                cur.execute("DELETE FROM license_sessions WHERE id = %s", (session[0],))
+            
+            conn.commit()
+            logging.info(f"Cleaned up {len(expired_sessions)} expired sessions")
+        
+        cur.close()
+        conn.close()
+        
+    except Exception as e:
+        logging.error(f"Error cleaning up sessions: {str(e)}")
+        if 'conn' in locals():
+            conn.rollback()
+
+
 def init_scheduler():
     """Initialize and configure the scheduler"""
     scheduler = BackgroundScheduler()
@@ -27,7 +78,17 @@ def init_scheduler():
         replace_existing=True
     )
     
+    # Configure session cleanup job - runs every 60 seconds
+    scheduler.add_job(
+        cleanup_expired_sessions,
+        'interval',
+        seconds=60,
+        id='session_cleanup',
+        replace_existing=True
+    )
+    
     scheduler.start()
     logging.info(f"Scheduler started. Daily backup scheduled at {config.SCHEDULER_CONFIG['backup_hour']:02d}:{config.SCHEDULER_CONFIG['backup_minute']:02d}")
+    logging.info("Session cleanup job scheduled to run every 60 seconds")
     
     return scheduler