From 0b8454ff6fd5f02c2cfd67c3775af5babcc9af5a Mon Sep 17 00:00:00 2001 From: administrateur Date: Sat, 29 Mar 2025 16:59:57 +0100 Subject: [PATCH] fix: debug & english language --- script_creator.py | 85 ++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/script_creator.py b/script_creator.py index 0a94550..1e4d3b5 100644 --- a/script_creator.py +++ b/script_creator.py @@ -9,7 +9,7 @@ import time app = Flask(__name__) -# Variables d'environnement +# Environment variables MINIO_BUCKET = os.getenv("MINIO_BUCKET", "nextcloud") MINIO_HOST = os.getenv("MINIO_HOST", "minio.minio.svc.cluster.local:9000") MINIO_REGION = os.getenv("MINIO_REGION", "us-east-1") @@ -20,7 +20,7 @@ DEBUG = bool(os.getenv("DEBUG", True)) S3_ACCESS_KEY = os.getenv("S3_ACCESS_KEY") S3_SECRET_KEY = os.getenv("S3_SECRET_KEY") if not S3_ACCESS_KEY or not S3_SECRET_KEY: - raise ValueError("❌ ERREUR: S3_ACCESS_KEY ou S3_SECRET_KEY manquantes") + raise ValueError("❌ ERROR: Missing S3_ACCESS_KEY or S3_SECRET_KEY") redis_host = os.getenv("REDIS_HOST", "redis.redis.svc.cluster.local") redis_port = int(os.getenv("REDIS_PORT", 6379)) @@ -32,16 +32,16 @@ local_lock = Lock() def log_debug(msg): if DEBUG: - print(f"🔍 DEBUG: {msg}") + print(f"🔍 DEBUG: {msg}", flush=True) def mount_s3(): - log_debug("🔧 Tentative de montage S3...") + log_debug("Attempting S3 mount...") with local_lock: if not os.path.ismount(MINIO_MOUNT_PATH): - log_debug("📂 Chemin non monté, création répertoire si besoin...") + log_debug(f"Mount path {MINIO_MOUNT_PATH} not mounted. Mounting now.") os.makedirs(MINIO_MOUNT_PATH, exist_ok=True) credentials_file = "/etc/passwd-s3fs" - log_debug(f"🔑 Création credentials S3 dans {credentials_file}") + log_debug(f"Creating credentials file: {credentials_file}") with open(credentials_file, "w") as f: f.write(f"{S3_ACCESS_KEY}:{S3_SECRET_KEY}\n") os.chmod(credentials_file, 0o600) @@ -54,97 +54,98 @@ def mount_s3(): "-o allow_other" ) - log_debug(f"🚀 Commande montage S3: {cmd}") + log_debug(f"Executing S3 mount command: {cmd}") result = subprocess.run(cmd, shell=True, capture_output=True, text=True) if result.returncode != 0: - log_debug(f"❌ Erreur montage S3: {result.stderr}") - raise RuntimeError(f"Erreur montage S3: {result.stderr}") - log_debug("✅ Montage S3 réussi.") + log_debug(f"S3 mount failed: {result.stderr}") + raise RuntimeError(f"S3 mount error: {result.stderr}") + log_debug("S3 mounted successfully.") else: - log_debug("✅ Montage S3 déjà actif, rien à faire.") + log_debug("S3 already mounted, skipping.") def unmount_s3(): - log_debug("🔧 Tentative de démontage S3...") + log_debug("Attempting S3 unmount...") with local_lock: if os.path.ismount(MINIO_MOUNT_PATH): cmd = f"fusermount -u {MINIO_MOUNT_PATH}" result = subprocess.run(cmd, shell=True, capture_output=True, text=True) if result.returncode == 0: - log_debug("✅ Démontage S3 réussi.") + log_debug("S3 unmounted successfully.") else: - log_debug(f"⚠️ Échec démontage S3: {result.stderr}") + log_debug(f"S3 unmount failed: {result.stderr}") else: - log_debug("✅ Aucun montage actif à démonter.") + log_debug("No active S3 mount to unmount.") def unmount_checker(): while True: - log_debug("⏰ Vérification périodique pour démontage S3 en cours...") + log_debug("Periodic check for S3 unmount...") time.sleep(S3_UNMOUNT_CHECK_INTERVAL) active_locks = redis_client.keys(f"{lock_prefix}*") if not active_locks: - log_debug("🟢 Aucun build actif détecté, démontage S3...") + log_debug("No active builds detected, proceeding to unmount S3.") unmount_s3() else: - log_debug("🔴 Des builds actifs existent encore, S3 reste monté.") + log_debug("Active builds detected, keeping S3 mounted.") @app.route("/build", methods=["POST"]) def build_mkdocs(): - log_debug("📥 Nouvelle requête POST reçue sur /build") + log_debug("POST request received at /build") data = request.json website = data.get("WEBSITE") error_callback = data.get("ERROR_CALLBACK", N8N_WEBHOOK_URL) if not website: - log_debug("❌ Erreur : WEBSITE manquant dans la requête.") - return jsonify({"error": "WEBSITE manquant"}), 400 + log_debug("Error: Missing 'WEBSITE' parameter in request.") + return jsonify({"error": "WEBSITE parameter missing"}), 400 lock_key = f"{lock_prefix}{website}" - log_debug(f"🔒 Tentative d'acquisition du verrou Redis pour: {lock_key}") - lock_acquired = redis_client.set(lock_key, "locked", nx=True, ex=60) + log_debug(f"Attempting to acquire Redis lock: {lock_key}") + try: + lock_acquired = redis_client.set(lock_key, "locked", nx=True, ex=60) + except redis.exceptions.ConnectionError as e: + log_debug(f"Redis connection failed: {e}") + return jsonify({"error": "Redis connection error"}), 500 if not lock_acquired: - log_debug(f"⚠️ Build déjà actif pour: {website}") - return jsonify({"status": "busy", "message": f"Build déjà actif: {website}"}), 429 + log_debug(f"Build already active for website: {website}") + return jsonify({"status": "busy", "message": f"Build already active: {website}"}), 429 try: - log_debug("🔧 Début du montage S3 pour build...") mount_s3() src = f"{MINIO_MOUNT_PATH}/files/sites/@{website}/mkdocs.yml" tmp = f"/srv/{website}" - log_debug(f"🔎 Vérification existence fichier : {src}") - + log_debug(f"Checking if mkdocs.yml exists at {src}") timeout = 10 start_time = time.time() while not os.path.exists(src): - elapsed = time.time() - start_time - if elapsed > timeout: - log_debug(f"❌ Timeout ({timeout}s): {src} introuvable après montage") - return jsonify({"error": f"{src} introuvable après montage"}), 404 - log_debug(f"⏳ Attente du fichier {src}... ({elapsed:.1f}s écoulées)") + if time.time() - start_time > timeout: + log_debug(f"Timeout: {src} not found after {timeout}s") + return jsonify({"error": f"{src} not found after mount"}), 404 + log_debug(f"Waiting for {src} to appear...") time.sleep(0.5) - log_debug(f"🚀 Lancement build MkDocs : {src} → {tmp}") + log_debug(f"Running MkDocs build: {src} -> {tmp}") cmd = f"mkdocs build --quiet --no-strict --config-file {src} --site-dir {tmp}" result = subprocess.run(cmd, shell=True, capture_output=True, text=True) if result.returncode != 0: build_error = base64.b64encode(result.stderr.encode()).decode() - json_payload = {"site": website, "erreur": build_error} - log_debug(f"❌ Échec du build MkDocs: {result.stderr}") + json_payload = {"site": website, "error": build_error} + log_debug(f"MkDocs build failed: {result.stderr}") requests.post(error_callback, json=json_payload, headers={"Content-Type": "application/json"}) - return jsonify({"status": "error", "message": "Build échoué", "error": result.stderr}), 500 + return jsonify({"status": "error", "message": "Build failed", "error": result.stderr}), 500 - log_debug(f"✅ Build MkDocs réussi pour: {website}") - return jsonify({"status": "success", "message": "Build réussi"}), 200 + log_debug(f"MkDocs build successful for website: {website}") + return jsonify({"status": "success", "message": "Build successful"}), 200 finally: redis_client.delete(lock_key) - log_debug(f"🔓 Verrou Redis libéré pour: {website}") + log_debug(f"Redis lock released for website: {website}") if __name__ == "__main__": - log_debug("🚀 Démarrage serveur Flask (0.0.0.0:80)") + log_debug("Starting Flask server on 0.0.0.0:80") checker_thread = Thread(target=unmount_checker, daemon=True) checker_thread.start() - app.run(host="0.0.0.0", port=80) \ No newline at end of file + app.run(host="0.0.0.0", port=80)