diff --git a/main.py b/main.py index 5e56a7e..5e7cb04 100644 --- a/main.py +++ b/main.py @@ -221,11 +221,18 @@ def timeout_sweeper_task(): if lock: try: + payload = lock.get("payload", {}) + # recovery Channel recovery_payload = { "type": "recovery", - "payload": lock.get("payload", {}) + "payload": { + "user_info": payload.get("user_info"), + "srv_name": "gen-service", + "values": payload.get("values") + } } + r.publish(RECOVERY_CHANNEL, json.dumps(recovery_payload)) print(f"[{SERVICE_NAME}] User {user_id} timed out from {catalog}. Sent to recovery.") except Exception as e: @@ -320,18 +327,6 @@ def redis_message_handler(): lock_manager.release(country, catalog, user_id) print(f"[{SERVICE_NAME}] Exit Room (Force/Command): {catalog} | User: {user_id}") - try: - # public recovery files - recovery_payload = { - "type": "recovery", - "payload": payload, - } - - r.publish(RECOVERY_CHANNEL, json.dumps(recovery_payload)) - print(f"[{SERVICE_NAME}] Sent user {user_id} to recovery channel (Exit).") - except Exception as e: - print(f"[{SERVICE_NAME}] Failed to sent user {user_id} to recovery channel (Exit).") - elif channel == GET_CATALOG_CHANNEL: try: if not FRONTEND_NOTIFY_URL: