From 3a0ad786120b2c7b3f01fc0dedd72aeb9c25dcb5 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 15:04:27 +0100 Subject: [PATCH 01/37] Refactor log retrieval in get_logs endpoint and improve log formatting in add_log_file function --- main.py | 8 +++----- utils.py | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index 5ab7792..4f89c34 100644 --- a/main.py +++ b/main.py @@ -48,11 +48,9 @@ async def get_jobs(job_id: int, request: Request, db: Session = Depends(get_db)) @app.get("/logs/{job_id}") async def get_logs(job_id: int, request: Request, db: Session = Depends(get_db)): - job = db.query(Job).filter(Job.id == job_id) - update_log = {"log": load_logs(job.first().name)} - job.update(update_log) - db.commit() - output = {"request": request, "job": update_log} + job = db.query(Job).filter(Job.id == job_id).first() + log_content = load_logs(job.name) + output = {"request": request, "job": {"log": log_content}} return templates.TemplateResponse("logs.html", output) diff --git a/utils.py b/utils.py index c557cac..f45ccb9 100644 --- a/utils.py +++ b/utils.py @@ -7,7 +7,7 @@ def add_log_file(command: Command, name: Name) -> str: log_file_name = name.replace(" ", "") - return f"{{{command} || echo Failed }} 2>&1 | ts >> logs/{log_file_name}.log" + return f"{{ {command} || echo Failed; }} 2>&1 | ts >> logs/{log_file_name}.log" def delete_log_file(name: Name) -> None: From 56eb25e91da2a4b255f8bd997a047261fbd719d0 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 16:03:04 +0100 Subject: [PATCH 02/37] =?UTF-8?q?Synchroniser=20les=20jobs=20de=20la=20bas?= =?UTF-8?q?e=20de=20donn=C3=A9es=20avec=20le=20crontab=20syst=C3=A8me=20au?= =?UTF-8?q?=20d=C3=A9marrage=20et=20ajouter=20la=20fonction=20de=20synchro?= =?UTF-8?q?nisation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cronservice.py | 19 +++++++++++++++++++ main.py | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/cronservice.py b/cronservice.py index dda92cd..900a699 100644 --- a/cronservice.py +++ b/cronservice.py @@ -48,3 +48,22 @@ def get_next_schedule(name: Name) -> str: return schedule.get_next().strftime("%d/%m/%Y %H:%M:%S").replace("/", "-") except IndexError: return None + + +def sync_job_to_cron(comm: Command, name: Name, sched: Schedule) -> None: + """Synchronise un job de la DB vers le crontab système""" + # Vérifier si le job existe déjà dans le crontab + existing_jobs = list(_cron.find_comment(name)) + + if existing_jobs: + # Mettre à jour le job existant + job = existing_jobs[0] + job.setall(sched) + job.set_command(add_log_file(comm, name)) + else: + # Créer un nouveau job + if croniter.is_valid(sched): + job = _cron.new(command=add_log_file(comm, name), comment=name) + job.setall(sched) + + _cron.write() diff --git a/main.py b/main.py index 4f89c34..92d9df3 100644 --- a/main.py +++ b/main.py @@ -2,6 +2,7 @@ from fastapi.staticfiles import StaticFiles from fastapi.templating import Jinja2Templates from sqlalchemy.orm import Session +import logging import models import cronservice @@ -9,6 +10,10 @@ from utils import watch_status, load_logs from database import SessionLocal, engine, JobRequest +# Configuration du logging +logging.basicConfig(level=logging.INFO) +logger = logging.getLogger(__name__) + app = FastAPI() app.mount("/static", StaticFiles(directory="static"), name="static") @@ -24,6 +29,36 @@ def get_db(): db.close() +@app.on_event("startup") +async def startup_event(): + """Synchronise la base de données avec le crontab système au démarrage""" + logger.info("🚀 Application démarrée - Synchronisation des jobs cron...") + + db = SessionLocal() + try: + # Récupérer tous les jobs de la base de données + jobs = db.query(Job).all() + + if jobs: + logger.info(f"📋 Synchronisation de {len(jobs)} job(s) avec le crontab système...") + + for job in jobs: + try: + cronservice.sync_job_to_cron(job.command, job.name, job.schedule) + logger.info(f" ✅ Job '{job.name}' synchronisé") + except Exception as e: + logger.error(f" ❌ Erreur lors de la synchronisation du job '{job.name}': {e}") + + logger.info("✅ Synchronisation terminée avec succès") + else: + logger.info("ℹ️ Aucun job à synchroniser") + + except Exception as e: + logger.error(f"❌ Erreur lors de la synchronisation au démarrage: {e}") + finally: + db.close() + + def update_displayed_schedule(db: Session = Depends(get_db)) -> None: jobs = db.query(Job).all() for job in jobs: From 499813f44eb7e95bf1a78661defb8d4c58b4994e Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 16:22:47 +0100 Subject: [PATCH 03/37] =?UTF-8?q?Am=C3=A9liorer=20la=20mise=20en=20forme?= =?UTF-8?q?=20du=20tableau=20des=20jobs=20et=20ajouter=20des=20information?= =?UTF-8?q?s=20sur=20le=20programme=20dans=20la=20popup=20de=20planificati?= =?UTF-8?q?on?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/home.html | 169 +++++++++++++++++++++++--------------------- 1 file changed, 87 insertions(+), 82 deletions(-) diff --git a/templates/home.html b/templates/home.html index f406e2f..47a266b 100644 --- a/templates/home.html +++ b/templates/home.html @@ -1,12 +1,12 @@ {% extends "layout.html" %} {% block content %} - + -
- - - +
+
+ + @@ -16,85 +16,90 @@ - - {% for job in jobs %} - - - - - - - - - - {% endfor %} -
Command Command NameAction Logs
-
Show Command
-
- 
{{ job.command }}
-
- 		- 
{{ job.name }}
- 		- 
{{ job.schedule }}
- 		- 
{{ job.next_run }}
- 		- 
{{ job.status }}
- 		- - - - - - - - - - - - - -
-

- -

-
+ + {% for job in jobs %} + + +
Show Command
+
+ 
{{ job.command }}
+
+ + + 
{{ job.name }}
+ + +
+ 
{{ job.schedule }}
+
+
+
+ Cron Expression: {{ job.schedule }}

+ Format: minute hour day month weekday
+ Next execution: {{ job.next_run }} +
+
+ + + 
{{ job.next_run }}
+ + + 
{{ job.status }}
+ + + + + + + + + + + + + + + + + + + {% endfor %} + +

+ +

+ -
- -
- Add Job -
-
-
-
- - -
-
- - -
-
- - -
- -
-
+
+ +
+ Add Job +
+
+
+
+ + +
+
+ + +
+
+ + +
+ +
-{% endblock %} +
+{% endblock %} \ No newline at end of file From cd063c01917c2a51fcded081183d15b268ae8de5 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 16:35:02 +0100 Subject: [PATCH 04/37] Ajouter le chemin complet pour la commande ts dans la fonction add_log_file --- utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils.py b/utils.py index f45ccb9..7d7c8c4 100644 --- a/utils.py +++ b/utils.py @@ -7,7 +7,7 @@ def add_log_file(command: Command, name: Name) -> str: log_file_name = name.replace(" ", "") - return f"{{ {command} || echo Failed; }} 2>&1 | ts >> logs/{log_file_name}.log" + return f"{{ {command} || echo Failed; }} 2>&1 | /usr/bin/ts >> logs/{log_file_name}.log" def delete_log_file(name: Name) -> None: From 407f37e592eca62636a53f39c2f400264f3d4549 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 17:03:11 +0100 Subject: [PATCH 05/37] =?UTF-8?q?Corriger=20les=20chemins=20des=20fichiers?= =?UTF-8?q?=20journaux=20en=20ajoutant=20os.getcwd()=20pour=20garantir=20l?= =?UTF-8?q?a=20portabilit=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils.py b/utils.py index 7d7c8c4..e285f71 100644 --- a/utils.py +++ b/utils.py @@ -1,4 +1,5 @@ import pathlib +import os Command = str Name = str @@ -7,13 +8,13 @@ def add_log_file(command: Command, name: Name) -> str: log_file_name = name.replace(" ", "") - return f"{{ {command} || echo Failed; }} 2>&1 | /usr/bin/ts >> logs/{log_file_name}.log" + return f"{{ {command} || echo Failed; }} 2>&1 | /usr/bin/ts >> {os.getcwd()}/logs/{log_file_name}.log" def delete_log_file(name: Name) -> None: try: log_file_name = name.replace(" ", "") - file = pathlib.Path(f"logs/{log_file_name}.log") + file = pathlib.Path(f"{os.getcwd()}/logs/{log_file_name}.log") file.unlink() except FileNotFoundError: return None @@ -21,7 +22,7 @@ def delete_log_file(name: Name) -> None: def load_logs(name: Name) -> str: log_file_name = name.replace(" ", "") - filename = f"logs/{log_file_name}.log" + filename = f"{os.getcwd()}/logs/{log_file_name}.log" try: with open(filename) as f: return f.read() From 5f47a72f60acd5afc9d5e408de04bf07b4875959 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 17:30:19 +0100 Subject: [PATCH 06/37] =?UTF-8?q?Am=C3=A9liorer=20l'affichage=20des=20logs?= =?UTF-8?q?=20en=20ajoutant=20des=20d=C3=A9tails=20sur=20le=20job,=20y=20c?= =?UTF-8?q?ompris=20la=20commande=20et=20le=20calendrier,=20dans=20la=20pa?= =?UTF-8?q?ge=20des=20logs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 2 +- templates/logs.html | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index 92d9df3..ada02f6 100644 --- a/main.py +++ b/main.py @@ -85,7 +85,7 @@ async def get_jobs(job_id: int, request: Request, db: Session = Depends(get_db)) async def get_logs(job_id: int, request: Request, db: Session = Depends(get_db)): job = db.query(Job).filter(Job.id == job_id).first() log_content = load_logs(job.name) - output = {"request": request, "job": {"log": log_content}} + output = {"request": request, "job": job, "log_content": log_content} return templates.TemplateResponse("logs.html", output) diff --git a/templates/logs.html b/templates/logs.html index 254938b..9ac8684 100644 --- a/templates/logs.html +++ b/templates/logs.html @@ -1,7 +1,19 @@ {% extends "layout.html" %} {% block content %} - -

Log

- 
{{ job.log }}
-
-{% endblock %} + +

Logs - {{ job.name }}

+
+

Command

+ 
{{ job.command }}
+
+
+

Schedule

+ 
{{ job.schedule }}
+
+
+

Output

+ 
{{ log_content }}
+
+← Back to Jobs +

+{% endblock %} \ No newline at end of file From 67d099258662b6bcc4c712da803effc2bdad1aa4 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 19:32:02 +0100 Subject: [PATCH 07/37] =?UTF-8?q?Ajout=20de=20la=20gestion=20des=20jobs=20?= =?UTF-8?q?en=20arri=C3=A8re-plan=20avec=20verrouillage=20pour=20=C3=A9vit?= =?UTF-8?q?er=20les=20ex=C3=A9cutions=20simultan=C3=A9es=20et=20am=C3=A9li?= =?UTF-8?q?oration=20de=20l'interface=20utilisateur=20pour=20le=20lancemen?= =?UTF-8?q?t=20des=20jobs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cronservice.py | 132 ++++++++++++++++++++++++++++++- main.py | 25 +++++- requirements.txt | 1 + static/main.js | 202 ++++++++++++++++++++++++----------------------- 4 files changed, 254 insertions(+), 106 deletions(-) diff --git a/cronservice.py b/cronservice.py index 900a699..61a0d8a 100644 --- a/cronservice.py +++ b/cronservice.py @@ -2,6 +2,10 @@ from croniter import croniter from datetime import datetime import getpass +import subprocess +import os +import psutil +from pathlib import Path from utils import add_log_file, Command, Name, Schedule, delete_log_file @@ -34,10 +38,130 @@ def delete_cron_job(name: Name) -> None: delete_log_file(name) -def run_manually(name: Name) -> None: - match = _cron.find_comment(name) - job = list(match)[0] - job.run() +def get_lock_file_path(job_id: int) -> Path: + """Retourne le chemin du fichier lock pour un job""" + return Path(f"/tmp/crontab_job_{job_id}.lock") + + +def is_job_running(job_id: int) -> tuple[bool, int | None]: + """ + Vérifie si un job est déjà en cours d'exécution. + + Returns: + tuple: (is_running, pid) - True si le job tourne, False sinon, avec le PID ou None + """ + lock_file = get_lock_file_path(job_id) + + if not lock_file.exists(): + return False, None + + try: + with open(lock_file, 'r') as f: + pid = int(f.read().strip()) + + # Vérifier si le process existe toujours + if psutil.pid_exists(pid): + try: + process = psutil.Process(pid) + # Vérifier que le process n'est pas un zombie + if process.status() != psutil.STATUS_ZOMBIE: + return True, pid + except (psutil.NoSuchProcess, psutil.AccessDenied): + pass + + # Le process n'existe plus, nettoyer le lock + lock_file.unlink() + return False, None + + except (ValueError, FileNotFoundError): + # Fichier lock corrompu ou supprimé entre-temps + if lock_file.exists(): + lock_file.unlink() + return False, None + + +def create_lock(job_id: int, pid: int) -> None: + """Crée un fichier lock avec le PID du process""" + lock_file = get_lock_file_path(job_id) + with open(lock_file, 'w') as f: + f.write(str(pid)) + + +def release_lock(job_id: int) -> None: + """Supprime le fichier lock""" + lock_file = get_lock_file_path(job_id) + if lock_file.exists(): + lock_file.unlink() + + +def run_manually(name: Name, job_id: int) -> dict: + """ + Lance un job manuellement en arrière-plan de manière non-bloquante. + + Returns: + dict: Informations sur le lancement (success, message, pid) + """ + # Vérifier si le job est déjà en cours d'exécution + is_running, existing_pid = is_job_running(job_id) + if is_running: + return { + "success": False, + "message": f"Job already running with PID {existing_pid}", + "pid": existing_pid + } + + try: + # Récupérer la commande du job + match = _cron.find_comment(name) + job = list(match)[0] + command = job.command + + # Lancer le job en arrière-plan avec un wrapper pour gérer le lock + wrapper_script = f"""#!/bin/bash +LOCK_FILE="/tmp/crontab_job_{job_id}.lock" +echo $$ > "$LOCK_FILE" +trap 'rm -f "$LOCK_FILE"' EXIT + +# Exécuter la commande +{command} +""" + + # Créer un fichier temporaire pour le script wrapper + wrapper_path = f"/tmp/crontab_wrapper_{job_id}.sh" + with open(wrapper_path, 'w') as f: + f.write(wrapper_script) + os.chmod(wrapper_path, 0o755) + + # Lancer le processus en arrière-plan détaché + process = subprocess.Popen( + ['/bin/bash', wrapper_path], + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + stdin=subprocess.DEVNULL, + start_new_session=True, # Détache complètement le processus + preexec_fn=os.setpgrp # Crée un nouveau groupe de processus + ) + + pid = process.pid + + return { + "success": True, + "message": f"Job lancé en arrière-plan (PID: {pid}). Consultez les logs pour suivre l'exécution.", + "pid": pid + } + + except IndexError: + return { + "success": False, + "message": "Job not found in crontab", + "pid": None + } + except Exception as e: + return { + "success": False, + "message": f"Error launching job: {str(e)}", + "pid": None + } def get_next_schedule(name: Name) -> str: diff --git a/main.py b/main.py index ada02f6..34d48f0 100644 --- a/main.py +++ b/main.py @@ -124,16 +124,35 @@ async def update_job( @app.get("/run_job/{job_id}/") async def run_job(job_id: int, db: Session = Depends(get_db)): + """ + Lance un job manuellement en arrière-plan. + Retourne immédiatement avec le statut du lancement. + """ chosen_job = db.query(Job).filter(Job.id == job_id).first() - chosen_name = chosen_job.name - cronservice.run_manually(chosen_name) - return {"msg": "Successfully run job."} + + if not chosen_job: + raise HTTPException(status_code=404, detail="Job not found") + + result = cronservice.run_manually(chosen_job.name, job_id) + + if not result["success"]: + raise HTTPException(status_code=409, detail=result["message"]) + + return { + "success": True, + "message": result["message"], + "pid": result["pid"] + } @app.delete("/job/{job_id}/") async def delete_job(job_id: int, db: Session = Depends(get_db)): job_update = db.query(Job).filter(Job.id == job_id).first() cronservice.delete_cron_job(job_update.name) + + # Nettoyer le lock si le job était en cours d'exécution + cronservice.release_lock(job_id) + db.delete(job_update) db.commit() return {"INFO": f"Deleted {job_id} Successfully"} diff --git a/requirements.txt b/requirements.txt index ad73da4..b82ecae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,6 +18,7 @@ nodeenv==1.6.0 pathspec==0.9.0 platformdirs==2.4.0 pre-commit==2.15.0 +psutil==5.8.0 pydantic==1.8.2 python-crontab==2.5.1 python-dateutil==2.8.2 diff --git a/static/main.js b/static/main.js index 13d4ebc..f72d8ef 100644 --- a/static/main.js +++ b/static/main.js @@ -1,106 +1,110 @@ $(document).ready(function () { - $("#add_job").click(function () { - $('.ui.modal').modal('show'); - }); - - $(".ui.inverted.red.button").click(function () { - if (confirm('Are you sure you want delete this job?')) { - const id = $(this).val(); - $.ajax({ - url: `job/${id}/`, - type: 'DELETE', - contentType: 'application/json', - }); - alert("Job Deleted!. Please Reload") - } - - - }); - - $(".ui.grey.basic.button").click(function () { - if (confirm('Are you sure you want run this job?')) { - const id = $(this).val(); - $.ajax({ - url: `/run_job/${id}/`, - type: 'GET', - contentType: 'application/json', - }); - - alert("Job is executed") - } - - }); - - $("#save").click(function () { - - const command = $("#command").val(); - const command_name = $("#command_name").val(); - const schedule = $("#schedule").val(); - - if (command === "" || command_name === "" || schedule === "") { - alert("You must fill out all fields") + $("#add_job").click(function () { + $(".ui.modal").modal("show"); + }); + + $(".ui.inverted.red.button").click(function () { + if (confirm("Are you sure you want delete this job?")) { + const id = $(this).val(); + $.ajax({ + url: `job/${id}/`, + type: "DELETE", + contentType: "application/json", + }); + alert("Job Deleted!. Please Reload"); + } + }); + + $(".ui.grey.basic.button").click(function () { + const id = $(this).val(); + + $.ajax({ + url: `/run_job/${id}/`, + type: "GET", + contentType: "application/json", + success: function (response) { + if (response.success) { + alert(`✅ ${response.message}`); } else { - $.ajax({ - url: '/create_job/', - type: 'POST', - contentType: 'application/json', - data: JSON.stringify({ - "command": command, - "name": command_name, - "schedule": schedule - }), - statusCode: { - 404: function () { - // No content found (404) - // This code will be executed if the server returns a 404 response - alert("Make sure the cron expression is valid.") - }, - }, - dataType: 'json', - }); + alert(`❌ ${response.message}`); } - - $('.ui.modal').modal('hide'); - - }); - - $("#update").click(function () { - const id = $(this).val(); - const command = $("#command").val(); - const command_name = $("#command_name").val(); - const schedule = $("#schedule").val(); - - if (command === "" || command_name === "" || schedule === "") { - alert("You must fill out all fields") + }, + error: function (xhr) { + if (xhr.status === 409) { + // Job already running + const errorMsg = xhr.responseJSON?.detail || "Job is already running"; + alert(`⚠️ ${errorMsg}`); } else { - $.ajax({ - url: `/update_job/${id}/`, - type: 'PUT', - contentType: 'application/json', - data: JSON.stringify({ - "command": command, - "name": command_name, - "schedule": schedule - }), - statusCode: { - 500: function () { - // No content found (404) - // This code will be executed if the server returns a 404 response - alert("Make sure the cron expression is valid.") - }, - }, - dataType: 'json' - }); - + alert("❌ Une erreur est survenue lors du lancement du job"); } - + }, }); - - $('.custom.button') - .popup({ - popup: $('.custom.popup'), - on: 'click', - inline: true - }); - + }); + + $("#save").click(function () { + const command = $("#command").val(); + const command_name = $("#command_name").val(); + const schedule = $("#schedule").val(); + + if (command === "" || command_name === "" || schedule === "") { + alert("You must fill out all fields"); + } else { + $.ajax({ + url: "/create_job/", + type: "POST", + contentType: "application/json", + data: JSON.stringify({ + command: command, + name: command_name, + schedule: schedule, + }), + statusCode: { + 404: function () { + // No content found (404) + // This code will be executed if the server returns a 404 response + alert("Make sure the cron expression is valid."); + }, + }, + dataType: "json", + }); + } + + $(".ui.modal").modal("hide"); + }); + + $("#update").click(function () { + const id = $(this).val(); + const command = $("#command").val(); + const command_name = $("#command_name").val(); + const schedule = $("#schedule").val(); + + if (command === "" || command_name === "" || schedule === "") { + alert("You must fill out all fields"); + } else { + $.ajax({ + url: `/update_job/${id}/`, + type: "PUT", + contentType: "application/json", + data: JSON.stringify({ + command: command, + name: command_name, + schedule: schedule, + }), + statusCode: { + 500: function () { + // No content found (404) + // This code will be executed if the server returns a 404 response + alert("Make sure the cron expression is valid."); + }, + }, + dataType: "json", + }); + } + }); + + $(".custom.button").popup({ + popup: $(".custom.popup"), + on: "click", + inline: true, + }); }); From 0235a1140e1d059fa385b7ab3a61a4a13c5b76be Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 19:52:23 +0100 Subject: [PATCH 08/37] =?UTF-8?q?Ajout=20de=20la=20journalisation=20pour?= =?UTF-8?q?=20le=20lancement=20des=20jobs=20et=20les=20erreurs=20dans=20cr?= =?UTF-8?q?onservice.py,=20ainsi=20que=20des=20messages=20de=20console=20p?= =?UTF-8?q?our=20les=20r=C3=A9ponses=20r=C3=A9ussies=20et=20d'erreur=20dan?= =?UTF-8?q?s=20main.js.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cronservice.py | 28 +++++++++++++++++++++++----- static/main.js | 2 ++ 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/cronservice.py b/cronservice.py index 61a0d8a..fea4555 100644 --- a/cronservice.py +++ b/cronservice.py @@ -4,11 +4,15 @@ import getpass import subprocess import os +import sys import psutil from pathlib import Path +import logging from utils import add_log_file, Command, Name, Schedule, delete_log_file +logger = logging.getLogger(__name__) + _user = getpass.getuser() _cron = CronTab(user=_user) @@ -104,6 +108,7 @@ def run_manually(name: Name, job_id: int) -> dict: # Vérifier si le job est déjà en cours d'exécution is_running, existing_pid = is_job_running(job_id) if is_running: + logger.warning(f"Job {job_id} ({name}) already running with PID {existing_pid}") return { "success": False, "message": f"Job already running with PID {existing_pid}", @@ -116,6 +121,8 @@ def run_manually(name: Name, job_id: int) -> dict: job = list(match)[0] command = job.command + logger.info(f"Launching job {job_id} ({name}) in background") + # Lancer le job en arrière-plan avec un wrapper pour gérer le lock wrapper_script = f"""#!/bin/bash LOCK_FILE="/tmp/crontab_job_{job_id}.lock" @@ -133,16 +140,25 @@ def run_manually(name: Name, job_id: int) -> dict: os.chmod(wrapper_path, 0o755) # Lancer le processus en arrière-plan détaché + # Utiliser preexec_fn seulement sur Unix/Linux + popen_kwargs = { + 'stdout': subprocess.DEVNULL, + 'stderr': subprocess.DEVNULL, + 'stdin': subprocess.DEVNULL, + 'start_new_session': True, + } + + # preexec_fn n'est disponible que sur Unix + if sys.platform != 'win32': + popen_kwargs['preexec_fn'] = os.setpgrp + process = subprocess.Popen( ['/bin/bash', wrapper_path], - stdout=subprocess.DEVNULL, - stderr=subprocess.DEVNULL, - stdin=subprocess.DEVNULL, - start_new_session=True, # Détache complètement le processus - preexec_fn=os.setpgrp # Crée un nouveau groupe de processus + **popen_kwargs ) pid = process.pid + logger.info(f"Job {job_id} ({name}) launched successfully with PID {pid}") return { "success": True, @@ -151,12 +167,14 @@ def run_manually(name: Name, job_id: int) -> dict: } except IndexError: + logger.error(f"Job {job_id} ({name}) not found in crontab") return { "success": False, "message": "Job not found in crontab", "pid": None } except Exception as e: + logger.error(f"Error launching job {job_id} ({name}): {str(e)}", exc_info=True) return { "success": False, "message": f"Error launching job: {str(e)}", diff --git a/static/main.js b/static/main.js index f72d8ef..2f33b5b 100644 --- a/static/main.js +++ b/static/main.js @@ -23,6 +23,7 @@ $(document).ready(function () { type: "GET", contentType: "application/json", success: function (response) { + console.log("Success response:", response); if (response.success) { alert(`✅ ${response.message}`); } else { @@ -30,6 +31,7 @@ $(document).ready(function () { } }, error: function (xhr) { + console.log("Error response:", xhr.status, xhr.responseJSON); if (xhr.status === 409) { // Job already running const errorMsg = xhr.responseJSON?.detail || "Job is already running"; From f5c7ea99d3342c758e72b03da15e79b2008fad0f Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 19:55:57 +0100 Subject: [PATCH 09/37] =?UTF-8?q?Ajout=20de=20la=20journalisation=20et=20g?= =?UTF-8?q?estion=20des=20erreurs=20dans=20les=20fonctions=20run=5Fjob=20e?= =?UTF-8?q?t=20main.js=20pour=20am=C3=A9liorer=20le=20suivi=20des=20jobs?= =?UTF-8?q?=20et=20la=20gestion=20des=20erreurs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 42 +++++++++++++++++++++++++++--------------- static/main.js | 27 ++++++++++++++++++++++++--- 2 files changed, 51 insertions(+), 18 deletions(-) diff --git a/main.py b/main.py index 34d48f0..8bc5646 100644 --- a/main.py +++ b/main.py @@ -128,21 +128,33 @@ async def run_job(job_id: int, db: Session = Depends(get_db)): Lance un job manuellement en arrière-plan. Retourne immédiatement avec le statut du lancement. """ - chosen_job = db.query(Job).filter(Job.id == job_id).first() - - if not chosen_job: - raise HTTPException(status_code=404, detail="Job not found") - - result = cronservice.run_manually(chosen_job.name, job_id) - - if not result["success"]: - raise HTTPException(status_code=409, detail=result["message"]) - - return { - "success": True, - "message": result["message"], - "pid": result["pid"] - } + try: + logger.info(f"Received request to run job {job_id}") + + chosen_job = db.query(Job).filter(Job.id == job_id).first() + + if not chosen_job: + logger.warning(f"Job {job_id} not found in database") + raise HTTPException(status_code=404, detail="Job not found") + + logger.info(f"Running job {job_id}: {chosen_job.name}") + result = cronservice.run_manually(chosen_job.name, job_id) + + if not result["success"]: + logger.warning(f"Job {job_id} execution rejected: {result['message']}") + raise HTTPException(status_code=409, detail=result["message"]) + + logger.info(f"Job {job_id} launched successfully with PID {result['pid']}") + return { + "success": True, + "message": result["message"], + "pid": result["pid"] + } + except HTTPException: + raise + except Exception as e: + logger.error(f"Unexpected error in run_job endpoint for job {job_id}: {str(e)}", exc_info=True) + raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}") @app.delete("/job/{job_id}/") diff --git a/static/main.js b/static/main.js index 2f33b5b..415174e 100644 --- a/static/main.js +++ b/static/main.js @@ -17,11 +17,13 @@ $(document).ready(function () { $(".ui.grey.basic.button").click(function () { const id = $(this).val(); + console.log(`Attempting to run job ${id}`); $.ajax({ url: `/run_job/${id}/`, type: "GET", contentType: "application/json", + dataType: "json", success: function (response) { console.log("Success response:", response); if (response.success) { @@ -30,14 +32,33 @@ $(document).ready(function () { alert(`❌ ${response.message}`); } }, - error: function (xhr) { - console.log("Error response:", xhr.status, xhr.responseJSON); + error: function (xhr, status, error) { + console.log("Error details:", { + status: xhr.status, + statusText: xhr.statusText, + responseText: xhr.responseText, + responseJSON: xhr.responseJSON, + error: error, + ajaxStatus: status, + }); + if (xhr.status === 409) { // Job already running const errorMsg = xhr.responseJSON?.detail || "Job is already running"; alert(`⚠️ ${errorMsg}`); + } else if (xhr.status === 404) { + alert(`❌ Job non trouvé`); + } else if (xhr.status === 500) { + const errorMsg = xhr.responseJSON?.detail || "Erreur serveur interne"; + alert(`❌ Erreur serveur: ${errorMsg}`); + } else if (xhr.status === 0) { + alert( + `❌ Erreur réseau: Impossible de contacter le serveur. Vérifiez que l'application est démarrée.` + ); } else { - alert("❌ Une erreur est survenue lors du lancement du job"); + alert( + `❌ Une erreur est survenue lors du lancement du job (${xhr.status})` + ); } }, }); From 3c5c5dceeff41a3e6a12adbfa60b5fb962069011 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 19:58:26 +0100 Subject: [PATCH 10/37] =?UTF-8?q?Simplification=20du=20d=C3=A9tachement=20?= =?UTF-8?q?du=20processus=20en=20supprimant=20les=20options=20inutiles=20p?= =?UTF-8?q?our=20Popen=20dans=20cronservice.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cronservice.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/cronservice.py b/cronservice.py index fea4555..f2e47cd 100644 --- a/cronservice.py +++ b/cronservice.py @@ -140,21 +140,13 @@ def run_manually(name: Name, job_id: int) -> dict: os.chmod(wrapper_path, 0o755) # Lancer le processus en arrière-plan détaché - # Utiliser preexec_fn seulement sur Unix/Linux - popen_kwargs = { - 'stdout': subprocess.DEVNULL, - 'stderr': subprocess.DEVNULL, - 'stdin': subprocess.DEVNULL, - 'start_new_session': True, - } - - # preexec_fn n'est disponible que sur Unix - if sys.platform != 'win32': - popen_kwargs['preexec_fn'] = os.setpgrp - + # start_new_session=True suffit pour détacher complètement le processus process = subprocess.Popen( ['/bin/bash', wrapper_path], - **popen_kwargs + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + stdin=subprocess.DEVNULL, + start_new_session=True, ) pid = process.pid From 62c66502339f2205b6452eb3f56a49a776da9f93 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 20:01:24 +0100 Subject: [PATCH 11/37] =?UTF-8?q?Refactor=20le=20lancement=20des=20jobs=20?= =?UTF-8?q?en=20arri=C3=A8re-plan=20en=20utilisant=20un=20script=20Python?= =?UTF-8?q?=20wrapper=20pour=20g=C3=A9rer=20le=20lock=20et=20l'ex=C3=A9cut?= =?UTF-8?q?ion,=20tout=20en=20ajoutant=20des=20journaux=20de=20d=C3=A9boga?= =?UTF-8?q?ge=20pour=20le=20suivi.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cronservice.py | 50 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/cronservice.py b/cronservice.py index f2e47cd..6cddd5f 100644 --- a/cronservice.py +++ b/cronservice.py @@ -122,34 +122,62 @@ def run_manually(name: Name, job_id: int) -> dict: command = job.command logger.info(f"Launching job {job_id} ({name}) in background") + logger.debug(f"Command to execute: {command}") - # Lancer le job en arrière-plan avec un wrapper pour gérer le lock - wrapper_script = f"""#!/bin/bash -LOCK_FILE="/tmp/crontab_job_{job_id}.lock" -echo $$ > "$LOCK_FILE" -trap 'rm -f "$LOCK_FILE"' EXIT - -# Exécuter la commande -{command} + # Créer un script Python wrapper qui gère le lock et l'exécution + wrapper_script = f"""#!/usr/bin/env python3 +import subprocess +import sys +import os +import signal + +# Ignorer SIGHUP pour survivre à la fermeture de la session parent +signal.signal(signal.SIGHUP, signal.SIG_IGN) + +lock_file = "/tmp/crontab_job_{job_id}.lock" +pid = os.getpid() + +# Écrire le PID dans le fichier lock +with open(lock_file, 'w') as f: + f.write(str(pid)) + +try: + # Exécuter la commande via shell + result = subprocess.run( + {repr(command)}, + shell=True, + capture_output=False + ) + sys.exit(result.returncode) +finally: + # Nettoyer le lock + try: + os.remove(lock_file) + except: + pass """ # Créer un fichier temporaire pour le script wrapper - wrapper_path = f"/tmp/crontab_wrapper_{job_id}.sh" + wrapper_path = f"/tmp/crontab_wrapper_{job_id}.py" with open(wrapper_path, 'w') as f: f.write(wrapper_script) os.chmod(wrapper_path, 0o755) + logger.debug(f"Wrapper script created at {wrapper_path}") + # Lancer le processus en arrière-plan détaché - # start_new_session=True suffit pour détacher complètement le processus process = subprocess.Popen( - ['/bin/bash', wrapper_path], + [sys.executable, wrapper_path], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, stdin=subprocess.DEVNULL, start_new_session=True, + close_fds=True, ) pid = process.pid + + # Ne pas attendre la fin du processus logger.info(f"Job {job_id} ({name}) launched successfully with PID {pid}") return { From bd570969141152f6bc5af0c9328ec91671bdbd42 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 20:05:02 +0100 Subject: [PATCH 12/37] =?UTF-8?q?Ajout=20de=20la=20configuration=20CORS=20?= =?UTF-8?q?dans=20main.py=20et=20am=C3=A9lioration=20de=20la=20journalisat?= =?UTF-8?q?ion=20dans=20main.js=20pour=20le=20suivi=20des=20ex=C3=A9cution?= =?UTF-8?q?s=20de=20jobs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 10 ++++++++++ static/main.js | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index 8bc5646..9be705b 100644 --- a/main.py +++ b/main.py @@ -1,6 +1,7 @@ from fastapi import FastAPI, Request, Depends, HTTPException from fastapi.staticfiles import StaticFiles from fastapi.templating import Jinja2Templates +from fastapi.middleware.cors import CORSMiddleware from sqlalchemy.orm import Session import logging @@ -16,6 +17,15 @@ app = FastAPI() +# Configuration CORS pour permettre les requêtes depuis le navigateur +app.add_middleware( + CORSMiddleware, + allow_origins=["*"], + allow_credentials=True, + allow_methods=["*"], + allow_headers=["*"], +) + app.mount("/static", StaticFiles(directory="static"), name="static") models.Base.metadata.create_all(bind=engine) templates = Jinja2Templates(directory="templates") diff --git a/static/main.js b/static/main.js index 415174e..d9b175f 100644 --- a/static/main.js +++ b/static/main.js @@ -18,12 +18,13 @@ $(document).ready(function () { $(".ui.grey.basic.button").click(function () { const id = $(this).val(); console.log(`Attempting to run job ${id}`); + console.log(`URL: ${window.location.origin}/run_job/${id}/`); $.ajax({ url: `/run_job/${id}/`, type: "GET", - contentType: "application/json", dataType: "json", + timeout: 10000, success: function (response) { console.log("Success response:", response); if (response.success) { From fdc2ced74cc4979553876167b849b5c173d8467b Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 20:09:08 +0100 Subject: [PATCH 13/37] =?UTF-8?q?Ajout=20d'une=20r=C3=A9ponse=20JSON=20exp?= =?UTF-8?q?licite=20pour=20la=20fonction=20run=5Fjob=20afin=20d'am=C3=A9li?= =?UTF-8?q?orer=20la=20compatibilit=C3=A9=20avec=20Firefox=20et=20la=20ges?= =?UTF-8?q?tion=20des=20en-t=C3=AAtes=20de=20cache.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index 9be705b..f06b728 100644 --- a/main.py +++ b/main.py @@ -2,6 +2,7 @@ from fastapi.staticfiles import StaticFiles from fastapi.templating import Jinja2Templates from fastapi.middleware.cors import CORSMiddleware +from fastapi.responses import JSONResponse from sqlalchemy.orm import Session import logging @@ -155,11 +156,21 @@ async def run_job(job_id: int, db: Session = Depends(get_db)): raise HTTPException(status_code=409, detail=result["message"]) logger.info(f"Job {job_id} launched successfully with PID {result['pid']}") - return { - "success": True, - "message": result["message"], - "pid": result["pid"] - } + + # Retourner une JSONResponse explicite pour Firefox + return JSONResponse( + content={ + "success": True, + "message": result["message"], + "pid": result["pid"] + }, + status_code=200, + headers={ + "Cache-Control": "no-cache, no-store, must-revalidate", + "Pragma": "no-cache", + "Expires": "0" + } + ) except HTTPException: raise except Exception as e: From e219381b97d489df197d4d3922662aea297449e9 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 20:12:33 +0100 Subject: [PATCH 14/37] =?UTF-8?q?Remplacement=20de=20$.ajax=20par=20fetch?= =?UTF-8?q?=20pour=20am=C3=A9liorer=20la=20compatibilit=C3=A9=20avec=20Fir?= =?UTF-8?q?efox=20et=20simplifier=20la=20gestion=20des=20r=C3=A9ponses=20J?= =?UTF-8?q?SON=20dans=20la=20fonction=20de=20lancement=20de=20job.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/main.js | 72 +++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 39 deletions(-) diff --git a/static/main.js b/static/main.js index d9b175f..a7c43ef 100644 --- a/static/main.js +++ b/static/main.js @@ -15,54 +15,48 @@ $(document).ready(function () { } }); - $(".ui.grey.basic.button").click(function () { + $(".ui.grey.basic.button").click(function (e) { + e.preventDefault(); // Empêcher tout comportement par défaut const id = $(this).val(); console.log(`Attempting to run job ${id}`); console.log(`URL: ${window.location.origin}/run_job/${id}/`); - $.ajax({ - url: `/run_job/${id}/`, - type: "GET", - dataType: "json", - timeout: 10000, - success: function (response) { - console.log("Success response:", response); - if (response.success) { - alert(`✅ ${response.message}`); - } else { - alert(`❌ ${response.message}`); - } + // Utiliser fetch au lieu de $.ajax pour meilleure compatibilité Firefox + fetch(`/run_job/${id}/`, { + method: "GET", + headers: { + "Accept": "application/json", }, - error: function (xhr, status, error) { - console.log("Error details:", { - status: xhr.status, - statusText: xhr.statusText, - responseText: xhr.responseText, - responseJSON: xhr.responseJSON, - error: error, - ajaxStatus: status, + cache: "no-cache", + }) + .then((response) => { + console.log("Response status:", response.status); + console.log("Response headers:", response.headers); + + // Lire le JSON même en cas d'erreur + return response.json().then((data) => { + return { status: response.status, data: data, ok: response.ok }; }); - - if (xhr.status === 409) { - // Job already running - const errorMsg = xhr.responseJSON?.detail || "Job is already running"; - alert(`⚠️ ${errorMsg}`); - } else if (xhr.status === 404) { + }) + .then(({ status, data, ok }) => { + console.log("Parsed response:", { status, data, ok }); + + if (ok && data.success) { + alert(`✅ ${data.message}`); + } else if (status === 409) { + alert(`⚠️ ${data.detail || "Job already running"}`); + } else if (status === 404) { alert(`❌ Job non trouvé`); - } else if (xhr.status === 500) { - const errorMsg = xhr.responseJSON?.detail || "Erreur serveur interne"; - alert(`❌ Erreur serveur: ${errorMsg}`); - } else if (xhr.status === 0) { - alert( - `❌ Erreur réseau: Impossible de contacter le serveur. Vérifiez que l'application est démarrée.` - ); + } else if (status === 500) { + alert(`❌ Erreur serveur: ${data.detail || "Erreur interne"}`); } else { - alert( - `❌ Une erreur est survenue lors du lancement du job (${xhr.status})` - ); + alert(`❌ ${data.message || data.detail || "Erreur inconnue"}`); } - }, - }); + }) + .catch((error) => { + console.error("Fetch error:", error); + alert(`❌ Erreur réseau: ${error.message}`); + }); }); $("#save").click(function () { From f16976b50cbb35b1b0a328e6b9e90d4f7369c428 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 20:13:29 +0100 Subject: [PATCH 15/37] =?UTF-8?q?Correction=20de=20la=20syntaxe=20des=20en?= =?UTF-8?q?-t=C3=AAtes=20dans=20la=20fonction=20de=20lancement=20de=20job?= =?UTF-8?q?=20et=20am=C3=A9lioration=20de=20la=20gestion=20des=20r=C3=A9po?= =?UTF-8?q?nses=20JSON.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/static/main.js b/static/main.js index a7c43ef..c2cfbf5 100644 --- a/static/main.js +++ b/static/main.js @@ -25,14 +25,14 @@ $(document).ready(function () { fetch(`/run_job/${id}/`, { method: "GET", headers: { - "Accept": "application/json", + Accept: "application/json", }, cache: "no-cache", }) .then((response) => { console.log("Response status:", response.status); console.log("Response headers:", response.headers); - + // Lire le JSON même en cas d'erreur return response.json().then((data) => { return { status: response.status, data: data, ok: response.ok }; @@ -40,7 +40,7 @@ $(document).ready(function () { }) .then(({ status, data, ok }) => { console.log("Parsed response:", { status, data, ok }); - + if (ok && data.success) { alert(`✅ ${data.message}`); } else if (status === 409) { From c7ddcca498424ea02a177fc314990eba529ae085 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 20:18:53 +0100 Subject: [PATCH 16/37] =?UTF-8?q?Refactor=20main.js=20pour=20remplacer=20j?= =?UTF-8?q?Query=20par=20JavaScript=20vanilla,=20am=C3=A9lioration=20de=20?= =?UTF-8?q?la=20gestion=20des=20=C3=A9v=C3=A9nements=20et=20des=20requ?= =?UTF-8?q?=C3=AAtes=20fetch.=20Mise=20=C3=A0=20jour=20des=20fichiers=20HT?= =?UTF-8?q?ML=20pour=20corriger=20le=20type=20de=20script=20et=20am=C3=A9l?= =?UTF-8?q?iorer=20la=20structure.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/main.js | 255 +++++++++++++++++++++++------------------- templates/home.html | 2 +- templates/jobs.html | 46 ++++---- templates/layout.html | 73 ++++++++---- templates/logs.html | 2 +- 5 files changed, 215 insertions(+), 163 deletions(-) diff --git a/static/main.js b/static/main.js index c2cfbf5..e259a32 100644 --- a/static/main.js +++ b/static/main.js @@ -1,128 +1,155 @@ -$(document).ready(function () { - $("#add_job").click(function () { - $(".ui.modal").modal("show"); - }); +// JavaScript vanilla moderne - pas de jQuery nécessaire +document.addEventListener("DOMContentLoaded", function () { + // Bouton "Add Job" - ouvre le modal + const addJobBtn = document.getElementById("add_job"); + if (addJobBtn) { + addJobBtn.addEventListener("click", function () { + const modal = document.querySelector(".ui.modal"); + if (modal) { + modal.classList.add("visible", "active"); + document.body.classList.add("dimmable", "dimmed"); + } + }); + } - $(".ui.inverted.red.button").click(function () { - if (confirm("Are you sure you want delete this job?")) { - const id = $(this).val(); - $.ajax({ - url: `job/${id}/`, - type: "DELETE", - contentType: "application/json", - }); - alert("Job Deleted!. Please Reload"); - } + // Boutons "Delete" (rouge) + document.querySelectorAll(".ui.inverted.red.button").forEach((button) => { + button.addEventListener("click", function () { + if (confirm("Are you sure you want delete this job?")) { + const id = this.value; + fetch(`job/${id}/`, { + method: "DELETE", + headers: { "Content-Type": "application/json" }, + }) + .then(() => alert("Job Deleted!. Please Reload")) + .catch((error) => alert(`Error: ${error.message}`)); + } + }); }); - $(".ui.grey.basic.button").click(function (e) { - e.preventDefault(); // Empêcher tout comportement par défaut - const id = $(this).val(); - console.log(`Attempting to run job ${id}`); - console.log(`URL: ${window.location.origin}/run_job/${id}/`); - - // Utiliser fetch au lieu de $.ajax pour meilleure compatibilité Firefox - fetch(`/run_job/${id}/`, { - method: "GET", - headers: { - Accept: "application/json", - }, - cache: "no-cache", - }) - .then((response) => { - console.log("Response status:", response.status); - console.log("Response headers:", response.headers); + // Boutons "Run Now" (gris) + document.querySelectorAll(".ui.grey.basic.button").forEach((button) => { + button.addEventListener("click", function (e) { + e.preventDefault(); + const id = this.value; + console.log(`Attempting to run job ${id}`); + console.log(`URL: ${window.location.origin}/run_job/${id}/`); - // Lire le JSON même en cas d'erreur - return response.json().then((data) => { - return { status: response.status, data: data, ok: response.ok }; - }); + fetch(`/run_job/${id}/`, { + method: "GET", + headers: { Accept: "application/json" }, + cache: "no-cache", }) - .then(({ status, data, ok }) => { - console.log("Parsed response:", { status, data, ok }); + .then((response) => { + console.log("Response status:", response.status); + return response.json().then((data) => ({ + status: response.status, + data: data, + ok: response.ok, + })); + }) + .then(({ status, data, ok }) => { + console.log("Parsed response:", { status, data, ok }); - if (ok && data.success) { - alert(`✅ ${data.message}`); - } else if (status === 409) { - alert(`⚠️ ${data.detail || "Job already running"}`); - } else if (status === 404) { - alert(`❌ Job non trouvé`); - } else if (status === 500) { - alert(`❌ Erreur serveur: ${data.detail || "Erreur interne"}`); - } else { - alert(`❌ ${data.message || data.detail || "Erreur inconnue"}`); - } - }) - .catch((error) => { - console.error("Fetch error:", error); - alert(`❌ Erreur réseau: ${error.message}`); - }); + if (ok && data.success) { + alert(`✅ ${data.message}`); + } else if (status === 409) { + alert(`⚠️ ${data.detail || "Job already running"}`); + } else if (status === 404) { + alert(`❌ Job non trouvé`); + } else if (status === 500) { + alert(`❌ Erreur serveur: ${data.detail || "Erreur interne"}`); + } else { + alert(`❌ ${data.message || data.detail || "Erreur inconnue"}`); + } + }) + .catch((error) => { + console.error("Fetch error:", error); + alert(`❌ Erreur réseau: ${error.message}`); + }); + }); }); - $("#save").click(function () { - const command = $("#command").val(); - const command_name = $("#command_name").val(); - const schedule = $("#schedule").val(); - - if (command === "" || command_name === "" || schedule === "") { - alert("You must fill out all fields"); - } else { - $.ajax({ - url: "/create_job/", - type: "POST", - contentType: "application/json", - data: JSON.stringify({ - command: command, - name: command_name, - schedule: schedule, - }), - statusCode: { - 404: function () { - // No content found (404) - // This code will be executed if the server returns a 404 response - alert("Make sure the cron expression is valid."); - }, - }, - dataType: "json", - }); - } + // Bouton "Save" - créer un job + const saveBtn = document.getElementById("save"); + if (saveBtn) { + saveBtn.addEventListener("click", function () { + const command = document.getElementById("command").value; + const command_name = document.getElementById("command_name").value; + const schedule = document.getElementById("schedule").value; - $(".ui.modal").modal("hide"); - }); + if (command === "" || command_name === "" || schedule === "") { + alert("You must fill out all fields"); + } else { + fetch("/create_job/", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + command: command, + name: command_name, + schedule: schedule, + }), + }) + .then((response) => { + if (response.status === 404) { + alert("Make sure the cron expression is valid."); + } + return response.json(); + }) + .then(() => { + // Fermer le modal + const modal = document.querySelector(".ui.modal"); + if (modal) { + modal.classList.remove("visible", "active"); + document.body.classList.remove("dimmable", "dimmed"); + } + location.reload(); // Recharger pour voir le nouveau job + }) + .catch((error) => console.error("Error:", error)); + } + }); + } - $("#update").click(function () { - const id = $(this).val(); - const command = $("#command").val(); - const command_name = $("#command_name").val(); - const schedule = $("#schedule").val(); + // Bouton "Update" - mettre à jour un job + const updateBtn = document.getElementById("update"); + if (updateBtn) { + updateBtn.addEventListener("click", function () { + const id = this.value; + const command = document.getElementById("command").value; + const command_name = document.getElementById("command_name").value; + const schedule = document.getElementById("schedule").value; - if (command === "" || command_name === "" || schedule === "") { - alert("You must fill out all fields"); - } else { - $.ajax({ - url: `/update_job/${id}/`, - type: "PUT", - contentType: "application/json", - data: JSON.stringify({ - command: command, - name: command_name, - schedule: schedule, - }), - statusCode: { - 500: function () { - // No content found (404) - // This code will be executed if the server returns a 404 response - alert("Make sure the cron expression is valid."); - }, - }, - dataType: "json", - }); - } - }); + if (command === "" || command_name === "" || schedule === "") { + alert("You must fill out all fields"); + } else { + fetch(`/update_job/${id}/`, { + method: "PUT", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + command: command, + name: command_name, + schedule: schedule, + }), + }) + .then((response) => { + if (response.status === 500) { + alert("Make sure the cron expression is valid."); + } + return response.json(); + }) + .then(() => location.reload()) + .catch((error) => console.error("Error:", error)); + } + }); + } - $(".custom.button").popup({ - popup: $(".custom.popup"), - on: "click", - inline: true, + // Popups pour les custom buttons (si nécessaire) + document.querySelectorAll(".custom.button").forEach((button) => { + button.addEventListener("click", function () { + const popup = this.nextElementSibling; + if (popup && popup.classList.contains("custom.popup")) { + popup.classList.toggle("visible"); + } + }); }); }); diff --git a/templates/home.html b/templates/home.html index 47a266b..2469810 100644 --- a/templates/home.html +++ b/templates/home.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% block content %} - +
diff --git a/templates/jobs.html b/templates/jobs.html index 26746e0..f2a9a5f 100644 --- a/templates/jobs.html +++ b/templates/jobs.html @@ -2,29 +2,27 @@ {% block content %} - + - -
- - -
-
- - -
-
- - -
- - - - + +
+ + +
+
+ + +
+
+ + +
+ + + + -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/templates/layout.html b/templates/layout.html index a4e0f71..4c88bd0 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -1,44 +1,71 @@ + Python Crontab WEB UI - - - + + + + -
-
- - Python Crontab UI - - - - +
+
+ + Python Crontab UI + + + + +
-
-
-
-
- {% block content %} - {% endblock %} -
+
+
+
+ {% block content %} + {% endblock %} +
- + - + + \ No newline at end of file diff --git a/templates/logs.html b/templates/logs.html index 9ac8684..0b195c0 100644 --- a/templates/logs.html +++ b/templates/logs.html @@ -1,6 +1,6 @@ {% extends "layout.html" %} {% block content %} - +

Logs - {{ job.name }}

Command

From fdc603b79f456ef54da0f99e320e9905dc9a6269 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 21:01:38 +0100 Subject: [PATCH 17/37] =?UTF-8?q?Ajout=20des=20fonctionnalit=C3=A9s=20pour?= =?UTF-8?q?=20effacer=20et=20rafra=C3=AEchir=20les=20logs=20des=20jobs.=20?= =?UTF-8?q?Impl=C3=A9mentation=20des=20routes=20correspondantes=20dans=20m?= =?UTF-8?q?ain.py,=20ajout=20de=20la=20logique=20de=20gestion=20des=20logs?= =?UTF-8?q?=20dans=20utils.py,=20et=20mise=20=C3=A0=20jour=20de=20l'interf?= =?UTF-8?q?ace=20utilisateur=20dans=20logs.html=20et=20main.js.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 56 +++++++++++++++++++++++++++++++++++++- static/main.js | 66 +++++++++++++++++++++++++++++++++++++++++++++ templates/logs.html | 4 ++- utils.py | 14 ++++++++++ 4 files changed, 138 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index f06b728..294f5d7 100644 --- a/main.py +++ b/main.py @@ -9,7 +9,7 @@ import models import cronservice from models import Job -from utils import watch_status, load_logs +from utils import watch_status, load_logs, clear_logs from database import SessionLocal, engine, JobRequest # Configuration du logging @@ -100,6 +100,60 @@ async def get_logs(job_id: int, request: Request, db: Session = Depends(get_db)) return templates.TemplateResponse("logs.html", output) +@app.post("/clear_logs/{job_id}/") +async def clear_job_logs(job_id: int, db: Session = Depends(get_db)): + """ + Efface le contenu des logs d'un job. + """ + try: + logger.info(f"Clearing logs for job {job_id}") + + job = db.query(Job).filter(Job.id == job_id).first() + + if not job: + logger.warning(f"Job {job_id} not found in database") + raise HTTPException(status_code=404, detail="Job not found") + + clear_logs(job.name) + logger.info(f"Logs cleared successfully for job {job_id}: {job.name}") + + return JSONResponse( + content={ + "success": True, + "message": "Logs cleared successfully" + }, + status_code=200 + ) + except Exception as e: + logger.error(f"Error clearing logs for job {job_id}: {str(e)}", exc_info=True) + raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}") + + +@app.get("/refresh_logs/{job_id}/") +async def refresh_job_logs(job_id: int, db: Session = Depends(get_db)): + """ + Récupère le contenu actuel des logs d'un job. + """ + try: + job = db.query(Job).filter(Job.id == job_id).first() + + if not job: + raise HTTPException(status_code=404, detail="Job not found") + + log_content = load_logs(job.name) + + return JSONResponse( + content={ + "success": True, + "log_content": log_content + }, + status_code=200 + ) + except Exception as e: + logger.error(f"Error refreshing logs for job {job_id}: {str(e)}", exc_info=True) + raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}") + + @app.post("/create_job/") async def create_job(job_request: JobRequest, db: Session = Depends(get_db)): job = Job() diff --git a/static/main.js b/static/main.js index e259a32..32001fd 100644 --- a/static/main.js +++ b/static/main.js @@ -152,4 +152,70 @@ document.addEventListener("DOMContentLoaded", function () { } }); }); + + // Bouton "Clear Logs" - efface les logs + const clearLogsBtn = document.getElementById("clear-logs"); + if (clearLogsBtn) { + clearLogsBtn.addEventListener("click", function () { + if (!confirm("Are you sure you want to clear all logs for this job?")) { + return; + } + + const jobId = this.getAttribute("data-job-id"); + console.log(`Clearing logs for job ${jobId}`); + + fetch(`/clear_logs/${jobId}/`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + }) + .then((response) => response.json()) + .then((data) => { + if (data.success) { + alert("✅ " + data.message); + // Vider l'affichage des logs + const logOutput = document.getElementById("log-output"); + if (logOutput) { + logOutput.textContent = ""; + } + } else { + alert("❌ Failed to clear logs"); + } + }) + .catch((error) => { + console.error("Error:", error); + alert(`❌ Error: ${error.message}`); + }); + }); + } + + // Bouton "Refresh Logs" - recharge les logs + const refreshLogsBtn = document.getElementById("refresh-logs"); + if (refreshLogsBtn) { + refreshLogsBtn.addEventListener("click", function () { + const jobId = this.getAttribute("data-job-id"); + console.log(`Refreshing logs for job ${jobId}`); + + fetch(`/refresh_logs/${jobId}/`, { + method: "GET", + headers: { Accept: "application/json" }, + }) + .then((response) => response.json()) + .then((data) => { + if (data.success) { + // Mettre à jour l'affichage des logs + const logOutput = document.getElementById("log-output"); + if (logOutput) { + logOutput.textContent = data.log_content; + } + console.log("Logs refreshed successfully"); + } else { + alert("❌ Failed to refresh logs"); + } + }) + .catch((error) => { + console.error("Error:", error); + alert(`❌ Error: ${error.message}`); + }); + }); + } }); diff --git a/templates/logs.html b/templates/logs.html index 0b195c0..53e0227 100644 --- a/templates/logs.html +++ b/templates/logs.html @@ -12,8 +12,10 @@

Schedule

Output

- 
{{ log_content }}
+ 
{{ log_content }}
← Back to Jobs + +

{% endblock %} \ No newline at end of file diff --git a/utils.py b/utils.py index e285f71..7bb4433 100644 --- a/utils.py +++ b/utils.py @@ -20,6 +20,20 @@ def delete_log_file(name: Name) -> None: return None +def clear_logs(name: Name) -> None: + """Vide le contenu du fichier de log sans le supprimer""" + log_file_name = name.replace(" ", "") + filename = f"{os.getcwd()}/logs/{log_file_name}.log" + try: + with open(filename, 'w') as f: + f.write("") + except FileNotFoundError: + # Créer le fichier s'il n'existe pas + pathlib.Path(f"{os.getcwd()}/logs").mkdir(parents=True, exist_ok=True) + with open(filename, 'w') as f: + f.write("") + + def load_logs(name: Name) -> str: log_file_name = name.replace(" ", "") filename = f"{os.getcwd()}/logs/{log_file_name}.log" From 9a8a91a0855ada79953bdfb7a7c92e14accef964 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 21:06:00 +0100 Subject: [PATCH 18/37] Modification du titre dans le menu pour afficher "Cron Jobs Manager" au lieu de "Python Crontab UI". --- templates/layout.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/templates/layout.html b/templates/layout.html index 4c88bd0..ef38888 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -45,15 +45,13 @@
- Python Crontab UI + Cron Jobs Manager
- -


From 26773a9de08f75fcf72bebe27cca4441e53256f8 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 21:12:52 +0100 Subject: [PATCH 19/37] =?UTF-8?q?Ajout=20d'un=20wrapper=20pour=20les=20job?= =?UTF-8?q?s=20cron=20afin=20de=20g=C3=A9rer=20le=20syst=C3=A8me=20de=20lo?= =?UTF-8?q?ck=20et=20=C3=A9viter=20les=20ex=C3=A9cutions=20simultan=C3=A9e?= =?UTF-8?q?s.=20Mise=20=C3=A0=20jour=20des=20fonctions=20li=C3=A9es=20aux?= =?UTF-8?q?=20jobs=20pour=20inclure=20un=20identifiant=20de=20job,=20perme?= =?UTF-8?q?ttant=20une=20gestion=20am=C3=A9lior=C3=A9e=20des=20logs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cron_wrapper.py | 95 +++++++++++++++++++++++++++++++++++++++++++++++++ cronservice.py | 14 ++++---- main.py | 17 ++++++--- utils.py | 12 +++++-- 4 files changed, 125 insertions(+), 13 deletions(-) create mode 100644 cron_wrapper.py diff --git a/cron_wrapper.py b/cron_wrapper.py new file mode 100644 index 0000000..0392d84 --- /dev/null +++ b/cron_wrapper.py @@ -0,0 +1,95 @@ +#!/usr/bin/env python3 +""" +Wrapper pour les jobs cron qui gère le système de lock. +Empêche l'exécution simultanée d'un même job (manuel ou cron). +""" +import sys +import subprocess +import os +import psutil +from pathlib import Path +from datetime import datetime + + +def log_message(message: str): + """Log un message avec timestamp""" + timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S") + print(f"[{timestamp}] {message}") + + +def get_lock_file_path(job_id: str) -> Path: + """Retourne le chemin du fichier lock""" + return Path(f"/tmp/crontab_job_{job_id}.lock") + + +def is_process_running(pid: int) -> bool: + """Vérifie si un processus est vivant (pas zombie)""" + try: + if psutil.pid_exists(pid): + process = psutil.Process(pid) + if process.status() != psutil.STATUS_ZOMBIE: + return True + except (psutil.NoSuchProcess, psutil.AccessDenied): + pass + return False + + +def main(): + if len(sys.argv) < 3: + log_message("Usage: cron_wrapper.py ") + sys.exit(1) + + job_id = sys.argv[1] + command = sys.argv[2] + lock_file = get_lock_file_path(job_id) + + # Vérifier si le job est déjà en cours d'exécution + if lock_file.exists(): + try: + with open(lock_file, 'r') as f: + existing_pid = int(f.read().strip()) + + if is_process_running(existing_pid): + log_message(f"Job {job_id} already running (PID: {existing_pid}), skipping execution") + sys.exit(0) + else: + log_message(f"Found stale lock file (PID: {existing_pid} not running), removing") + lock_file.unlink() + except (ValueError, FileNotFoundError) as e: + log_message(f"Error reading lock file: {e}, removing") + if lock_file.exists(): + lock_file.unlink() + + # Créer le lock avec notre PID + my_pid = os.getpid() + try: + with open(lock_file, 'w') as f: + f.write(str(my_pid)) + log_message(f"Job {job_id} started (PID: {my_pid})") + except Exception as e: + log_message(f"Failed to create lock file: {e}") + sys.exit(1) + + # Exécuter la commande + exit_code = 0 + try: + result = subprocess.run(command, shell=True, executable='/bin/bash') + exit_code = result.returncode + log_message(f"Job {job_id} completed with exit code {exit_code}") + except Exception as e: + log_message(f"Error executing job {job_id}: {e}") + exit_code = 1 + finally: + # Supprimer le lock + try: + if lock_file.exists(): + lock_file.unlink() + log_message(f"Lock released for job {job_id}") + except Exception as e: + log_message(f"Failed to remove lock file: {e}") + + sys.exit(exit_code) + + +if __name__ == "__main__": + main() diff --git a/cronservice.py b/cronservice.py index 6cddd5f..b3cc184 100644 --- a/cronservice.py +++ b/cronservice.py @@ -18,20 +18,20 @@ _cron = CronTab(user=_user) -def add_cron_job(comm: Command, name: Name, sched: Schedule) -> None: +def add_cron_job(comm: Command, name: Name, sched: Schedule, job_id: int) -> None: if croniter.is_valid(sched): - job = _cron.new(command=add_log_file(comm, name), comment=name) + job = _cron.new(command=add_log_file(comm, name, job_id), comment=name) job.setall(sched) _cron.write() else: raise ValueError("Invalid Cron Expression") -def update_cron_job(comm: Command, name: Name, sched: Schedule, old_name: Name) -> None: +def update_cron_job(comm: Command, name: Name, sched: Schedule, old_name: Name, job_id: int) -> None: match = _cron.find_comment(old_name) job = list(match)[0] job.setall(sched) - job.set_command(add_log_file(comm, name)) + job.set_command(add_log_file(comm, name, job_id)) job.set_comment(name) _cron.write() @@ -212,7 +212,7 @@ def get_next_schedule(name: Name) -> str: return None -def sync_job_to_cron(comm: Command, name: Name, sched: Schedule) -> None: +def sync_job_to_cron(comm: Command, name: Name, sched: Schedule, job_id: int) -> None: """Synchronise un job de la DB vers le crontab système""" # Vérifier si le job existe déjà dans le crontab existing_jobs = list(_cron.find_comment(name)) @@ -221,11 +221,11 @@ def sync_job_to_cron(comm: Command, name: Name, sched: Schedule) -> None: # Mettre à jour le job existant job = existing_jobs[0] job.setall(sched) - job.set_command(add_log_file(comm, name)) + job.set_command(add_log_file(comm, name, job_id)) else: # Créer un nouveau job if croniter.is_valid(sched): - job = _cron.new(command=add_log_file(comm, name), comment=name) + job = _cron.new(command=add_log_file(comm, name, job_id), comment=name) job.setall(sched) _cron.write() diff --git a/main.py b/main.py index 294f5d7..7afb8ec 100644 --- a/main.py +++ b/main.py @@ -55,7 +55,7 @@ async def startup_event(): for job in jobs: try: - cronservice.sync_job_to_cron(job.command, job.name, job.schedule) + cronservice.sync_job_to_cron(job.command, job.name, job.schedule, job.id) logger.info(f" ✅ Job '{job.name}' synchronisé") except Exception as e: logger.error(f" ❌ Erreur lors de la synchronisation du job '{job.name}': {e}") @@ -161,11 +161,17 @@ async def create_job(job_request: JobRequest, db: Session = Depends(get_db)): job.name = job_request.name job.schedule = job_request.schedule try: - cronservice.add_cron_job(job.command, job.name, job.schedule) - job.next_run = cronservice.get_next_schedule(job.name) + # D'abord ajouter à la DB pour obtenir l'ID db.add(job) db.commit() + db.refresh(job) # Récupérer l'ID généré + + # Ensuite ajouter au crontab avec l'ID + cronservice.add_cron_job(job.command, job.name, job.schedule, job.id) + job.next_run = cronservice.get_next_schedule(job.name) + db.commit() except ValueError: + db.rollback() raise HTTPException(status_code=404, detail="Invalid Cron Expression") return job_request @@ -175,11 +181,14 @@ async def update_job( job_id: int, job_request: JobRequest, db: Session = Depends(get_db) ): existing_job = db.query(Job).filter(Job.id == job_id) + old_name = existing_job.first().name + cronservice.update_cron_job( job_request.command, job_request.name, job_request.schedule, - existing_job.first().name, + old_name, + job_id ) existing_job.update(job_request.__dict__) existing_job.update({"next_run": cronservice.get_next_schedule(job_request.name)}) diff --git a/utils.py b/utils.py index 7bb4433..139a95b 100644 --- a/utils.py +++ b/utils.py @@ -6,9 +6,17 @@ Schedule = str -def add_log_file(command: Command, name: Name) -> str: +def add_log_file(command: Command, name: Name, job_id: int = None) -> str: log_file_name = name.replace(" ", "") - return f"{{ {command} || echo Failed; }} 2>&1 | /usr/bin/ts >> {os.getcwd()}/logs/{log_file_name}.log" + base_command = f"{{ {command} || echo Failed; }} 2>&1 | /usr/bin/ts >> {os.getcwd()}/logs/{log_file_name}.log" + + # Si job_id est fourni, utiliser le wrapper pour gérer le lock + if job_id is not None: + # Wrapper qui gère le lock et empêche les exécutions simultanées + return f'/usr/bin/python3 {os.getcwd()}/cron_wrapper.py {job_id} "{base_command}"' + else: + # Ancien comportement (compatibilité) + return base_command def delete_log_file(name: Name) -> None: From 895837e39a6b44e246942df68b42f2b71ab96e83 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 21:23:00 +0100 Subject: [PATCH 20/37] =?UTF-8?q?Ajout=20de=20la=20fonctionnalit=C3=A9=20d?= =?UTF-8?q?e=20popups=20"Show=20Command"=20avec=20gestion=20de=20la=20visi?= =?UTF-8?q?bilit=C3=A9=20et=20des=20styles=20correspondants.=20Am=C3=A9lio?= =?UTF-8?q?ration=20de=20l'interaction=20utilisateur=20en=20fermant=20les?= =?UTF-8?q?=20popups=20lors=20de=20clics=20en=20dehors.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/main.js | 41 ++++++++++++++++++++++++++++++++++++++--- templates/layout.html | 29 +++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 3 deletions(-) diff --git a/static/main.js b/static/main.js index 32001fd..c72af8f 100644 --- a/static/main.js +++ b/static/main.js @@ -143,16 +143,51 @@ document.addEventListener("DOMContentLoaded", function () { }); } - // Popups pour les custom buttons (si nécessaire) + // Popups "Show Command" - toggle visibility document.querySelectorAll(".custom.button").forEach((button) => { - button.addEventListener("click", function () { + button.addEventListener("click", function (e) { + e.stopPropagation(); + + // Trouver le popup qui suit directement ce bouton const popup = this.nextElementSibling; - if (popup && popup.classList.contains("custom.popup")) { + + if ( + popup && + popup.classList.contains("custom") && + popup.classList.contains("popup") + ) { + // Fermer tous les autres popups + document.querySelectorAll(".custom.popup.visible").forEach((p) => { + if (p !== popup) { + p.classList.remove("visible"); + } + }); + + // Toggle ce popup popup.classList.toggle("visible"); + + // Positionner le popup + const rect = this.getBoundingClientRect(); + popup.style.position = "absolute"; + popup.style.top = rect.bottom + 5 + "px"; + popup.style.left = rect.left + "px"; + popup.style.zIndex = "1000"; } }); }); + // Fermer les popups si on clique ailleurs + document.addEventListener("click", function (e) { + if ( + !e.target.classList.contains("custom") || + !e.target.classList.contains("button") + ) { + document.querySelectorAll(".custom.popup.visible").forEach((popup) => { + popup.classList.remove("visible"); + }); + } + }); + // Bouton "Clear Logs" - efface les logs const clearLogsBtn = document.getElementById("clear-logs"); if (clearLogsBtn) { diff --git a/templates/layout.html b/templates/layout.html index ef38888..c55ff6c 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -37,6 +37,35 @@ background: rgba(0, 0, 0, 0.85); z-index: 1000; } + + /* Styles pour les popups "Show Command" */ + .ui.custom.popup { + display: none; + position: fixed; + background: white; + border: 1px solid rgba(34, 36, 38, 0.15); + border-radius: 0.28571429rem; + padding: 1em; + box-shadow: 0 2px 4px 0 rgba(34, 36, 38, 0.12), 0 2px 10px 0 rgba(34, 36, 38, 0.15); + max-width: 500px; + z-index: 1900; + } + + .ui.custom.popup.visible { + display: block !important; + } + + .ui.custom.popup pre { + margin: 0; + background: #f4f4f4; + padding: 0.5em; + border-radius: 3px; + overflow-x: auto; + } + + .ui.custom.button { + cursor: pointer; + } From a30e2f4caba2fddbd46f020e264903bba7b81dfe Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 21:32:35 +0100 Subject: [PATCH 21/37] =?UTF-8?q?Am=C3=A9lioration=20de=20la=20gestion=20d?= =?UTF-8?q?es=20erreurs=20et=20des=20alertes=20lors=20de=20l'ex=C3=A9cutio?= =?UTF-8?q?n=20des=20jobs.=20Ajout=20de=20la=20propagation=20d'=C3=A9v?= =?UTF-8?q?=C3=A9nements=20et=20mise=20=C3=A0=20jour=20de=20l'interface=20?= =?UTF-8?q?pour=20supprimer=20les=20liens=20inutiles.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/main.js | 22 +++++++++++++++++++--- templates/home.html | 12 ++++-------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/static/main.js b/static/main.js index c72af8f..ecab136 100644 --- a/static/main.js +++ b/static/main.js @@ -31,17 +31,31 @@ document.addEventListener("DOMContentLoaded", function () { document.querySelectorAll(".ui.grey.basic.button").forEach((button) => { button.addEventListener("click", function (e) { e.preventDefault(); + e.stopPropagation(); + const id = this.value; console.log(`Attempting to run job ${id}`); - console.log(`URL: ${window.location.origin}/run_job/${id}/`); + + if (!id) { + console.error("No job ID found"); + alert("❌ Erreur: ID du job non trouvé"); + return; + } fetch(`/run_job/${id}/`, { method: "GET", - headers: { Accept: "application/json" }, + headers: { + Accept: "application/json", + "Content-Type": "application/json", + }, cache: "no-cache", + credentials: "same-origin", }) .then((response) => { console.log("Response status:", response.status); + if (!response.ok && response.status !== 409) { + throw new Error(`HTTP ${response.status}: ${response.statusText}`); + } return response.json().then((data) => ({ status: response.status, data: data, @@ -65,7 +79,9 @@ document.addEventListener("DOMContentLoaded", function () { }) .catch((error) => { console.error("Fetch error:", error); - alert(`❌ Erreur réseau: ${error.message}`); + alert( + `❌ Erreur réseau: ${error.message}\n\nVérifiez la console (F12) pour plus de détails.` + ); }); }); }); diff --git a/templates/home.html b/templates/home.html index 2469810..6851a2c 100644 --- a/templates/home.html +++ b/templates/home.html @@ -47,18 +47,14 @@ 
{{ job.status }}
+ @@ -18,7 +19,14 @@ {% for job in jobs %} - + + - diff --git a/templates/layout.html b/templates/layout.html index 20e77c1..89c347d 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -86,6 +86,32 @@ .ui.toggle.checkbox input:checked~label::before { background-color: #21ba45 !important; } + + /* Styles pour les boutons d'action */ + .action-buttons { + white-space: nowrap; + } + + .action-buttons .ui.button, + td .ui.icon.button { + margin: 2px !important; + padding: 8px 10px !important; + } + + .ui.icon.button:hover { + transform: scale(1.1); + transition: transform 0.1s ease; + } + + .ui.icon.button[disabled] { + opacity: 0.3 !important; + cursor: not-allowed; + } + + /* Tooltips natifs améliorés */ + [title] { + position: relative; + } From 0a22ad7b9726bf9b3e34486c1dab3f1bb9648ed1 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Thu, 4 Dec 2025 19:06:10 +0100 Subject: [PATCH 37/37] =?UTF-8?q?Mise=20=C3=A0=20jour=20des=20messages=20e?= =?UTF-8?q?t=20des=20commentaires=20en=20anglais=20dans=20le=20code=20pour?= =?UTF-8?q?=20une=20meilleure=20coh=C3=A9rence.=20Changement=20des=20texte?= =?UTF-8?q?s=20dans=20l'interface=20utilisateur=20pour=20remplacer=20le=20?= =?UTF-8?q?fran=C3=A7ais=20par=20l'anglais.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 14 +++++++------- static/main.js | 20 ++++++++++---------- templates/home.html | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/main.py b/main.py index 0514a36..169dbef 100644 --- a/main.py +++ b/main.py @@ -267,8 +267,8 @@ async def delete_job(job_id: int, db: Session = Depends(get_db)): @app.post("/toggle_job/{job_id}/") async def toggle_job(job_id: int, db: Session = Depends(get_db)): """ - Active ou désactive un job (toggle). - Un job désactivé est commenté dans le crontab avec #. + Enable or disable a job (toggle). + A disabled job is commented in the crontab with #. """ try: job = db.query(Job).filter(Job.id == job_id).first() @@ -276,27 +276,27 @@ async def toggle_job(job_id: int, db: Session = Depends(get_db)): if not job: raise HTTPException(status_code=404, detail="Job not found") - # Toggle l'état + # Toggle the state new_state = not job.is_active - # Mettre à jour dans le crontab + # Update in crontab success = cronservice.enable_cron_job(job.name, new_state) if not success: raise HTTPException(status_code=500, detail="Failed to update crontab") - # Mettre à jour dans la base de données + # Update in database job.is_active = new_state db.commit() - status_text = "activé" if new_state else "désactivé" + status_text = "enabled" if new_state else "disabled" logger.info(f"Job {job_id} ({job.name}) {status_text}") return JSONResponse( content={ "success": True, "is_active": new_state, - "message": f"Job {status_text} avec succès" + "message": f"Job {status_text} successfully" }, status_code=200 ) diff --git a/static/main.js b/static/main.js index 84a5156..3593e26 100644 --- a/static/main.js +++ b/static/main.js @@ -41,14 +41,14 @@ document.addEventListener("DOMContentLoaded", function () { // Recharger pour mettre à jour le "Next Run" setTimeout(() => location.reload(), 500); } else { - alert(`❌ ${data.message || "Erreur inconnue"}`); + alert(`❌ ${data.message || "Unknown error"}`); // Remettre le toggle à son état précédent toggle.checked = !isChecked; } }) .catch((error) => { console.error("Error toggling job:", error); - alert(`❌ Erreur: ${error.message}`); + alert(`❌ Error: ${error.message}`); // Remettre le toggle à son état précédent toggle.checked = !isChecked; }); @@ -107,17 +107,17 @@ document.addEventListener("DOMContentLoaded", function () { // Boutons "Delete" (poubelle) document.querySelectorAll(".delete-btn").forEach((button) => { button.addEventListener("click", function () { - if (confirm("Êtes-vous sûr de vouloir supprimer ce job ?")) { + if (confirm("Are you sure you want to delete this job?")) { const id = this.value; fetch(`job/${id}/`, { method: "DELETE", headers: { "Content-Type": "application/json" }, }) .then(() => { - alert("✅ Job supprimé !"); + alert("✅ Job deleted!"); location.reload(); }) - .catch((error) => alert(`❌ Erreur: ${error.message}`)); + .catch((error) => alert(`❌ Error: ${error.message}`)); } }); }); @@ -133,7 +133,7 @@ document.addEventListener("DOMContentLoaded", function () { if (!id) { console.error("No job ID found"); - alert("❌ Erreur: ID du job non trouvé"); + alert("❌ Error: Job ID not found"); return; } @@ -165,17 +165,17 @@ document.addEventListener("DOMContentLoaded", function () { } else if (status === 409) { alert(`⚠️ ${data.detail || "Job already running"}`); } else if (status === 404) { - alert(`❌ Job non trouvé`); + alert(`❌ Job not found`); } else if (status === 500) { - alert(`❌ Erreur serveur: ${data.detail || "Erreur interne"}`); + alert(`❌ Server error: ${data.detail || "Internal error"}`); } else { - alert(`❌ ${data.message || data.detail || "Erreur inconnue"}`); + alert(`❌ ${data.message || data.detail || "Unknown error"}`); } }) .catch((error) => { console.error("Fetch error:", error); alert( - `❌ Erreur réseau: ${error.message}\n\nVérifiez la console (F12) pour plus de détails.` + `❌ Network error: ${error.message}\n\nCheck the console (F12) for more details.` ); }); }); diff --git a/templates/home.html b/templates/home.html index 0935317..9611c61 100644 --- a/templates/home.html +++ b/templates/home.html @@ -50,29 +50,29 @@
- - - + - - - + From e3221e680d3f71e49b9a6a232819b264bbc8dc0f Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 21:44:52 +0100 Subject: [PATCH 22/37] =?UTF-8?q?Ajout=20de=20la=20gestion=20s=C3=A9curis?= =?UTF-8?q?=C3=A9e=20des=20commandes=20en=20utilisant=20shlex.quote=20pour?= =?UTF-8?q?=20=C3=A9viter=20les=20injections=20lors=20de=20l'ex=C3=A9cutio?= =?UTF-8?q?n=20des=20commandes=20shell.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cronservice.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cronservice.py b/cronservice.py index b3cc184..a2c317d 100644 --- a/cronservice.py +++ b/cronservice.py @@ -1,6 +1,6 @@ from crontab import CronTab from croniter import croniter -from datetime import datetime +from datetime import datetime, timedelta import getpass import subprocess import os @@ -8,6 +8,7 @@ import psutil from pathlib import Path import logging +import shlex from utils import add_log_file, Command, Name, Schedule, delete_log_file @@ -144,7 +145,7 @@ def run_manually(name: Name, job_id: int) -> dict: try: # Exécuter la commande via shell result = subprocess.run( - {repr(command)}, + {shlex.quote(command)}, shell=True, capture_output=False ) From 1ebe2c21b4c5e3a42dced0b68c5733f4bd691993 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 21:53:03 +0100 Subject: [PATCH 23/37] =?UTF-8?q?Am=C3=A9lioration=20de=20la=20gestion=20d?= =?UTF-8?q?es=20fichiers=20de=20lock=20pour=20les=20jobs=20cron.=20Ajout?= =?UTF-8?q?=20de=20logs=20d=C3=A9taill=C3=A9s=20pour=20le=20suivi=20des=20?= =?UTF-8?q?processus=20et=20nettoyage=20des=20fichiers=20de=20lock=20obsol?= =?UTF-8?q?=C3=A8tes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cronservice.py | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/cronservice.py b/cronservice.py index a2c317d..3d86a54 100644 --- a/cronservice.py +++ b/cronservice.py @@ -57,25 +57,40 @@ def is_job_running(job_id: int) -> tuple[bool, int | None]: """ lock_file = get_lock_file_path(job_id) + logger.debug(f"Checking lock file: {lock_file}, exists: {lock_file.exists()}") + if not lock_file.exists(): + logger.debug(f"No lock file for job {job_id}") return False, None try: with open(lock_file, 'r') as f: pid = int(f.read().strip()) + logger.debug(f"Lock file contains PID: {pid}") + # Vérifier si le process existe toujours if psutil.pid_exists(pid): + logger.debug(f"PID {pid} exists in system") try: process = psutil.Process(pid) + status = process.status() + logger.debug(f"Process {pid} status: {status}") # Vérifier que le process n'est pas un zombie - if process.status() != psutil.STATUS_ZOMBIE: + if status != psutil.STATUS_ZOMBIE: + logger.info(f"Job {job_id} is running with PID {pid}") return True, pid - except (psutil.NoSuchProcess, psutil.AccessDenied): + else: + logger.debug(f"Process {pid} is zombie, cleaning lock") + except (psutil.NoSuchProcess, psutil.AccessDenied) as e: + logger.debug(f"Process check failed: {e}") pass + else: + logger.debug(f"PID {pid} does not exist") # Le process n'existe plus, nettoyer le lock lock_file.unlink() + logger.debug(f"Cleaned stale lock file for job {job_id}") return False, None except (ValueError, FileNotFoundError): @@ -125,7 +140,7 @@ def run_manually(name: Name, job_id: int) -> dict: logger.info(f"Launching job {job_id} ({name}) in background") logger.debug(f"Command to execute: {command}") - # Créer un script Python wrapper qui gère le lock et l'exécution + # Créer un script Python wrapper qui gère l'exécution wrapper_script = f"""#!/usr/bin/env python3 import subprocess import sys @@ -136,16 +151,11 @@ def run_manually(name: Name, job_id: int) -> dict: signal.signal(signal.SIGHUP, signal.SIG_IGN) lock_file = "/tmp/crontab_job_{job_id}.lock" -pid = os.getpid() - -# Écrire le PID dans le fichier lock -with open(lock_file, 'w') as f: - f.write(str(pid)) try: # Exécuter la commande via shell result = subprocess.run( - {shlex.quote(command)}, + {repr(command)}, shell=True, capture_output=False ) @@ -178,6 +188,10 @@ def run_manually(name: Name, job_id: int) -> dict: pid = process.pid + # Créer immédiatement le lock avec le PID du wrapper + create_lock(job_id, pid) + logger.info(f"Lock created for job {job_id} with PID {pid}") + # Ne pas attendre la fin du processus logger.info(f"Job {job_id} ({name}) launched successfully with PID {pid}") From 722be31c22065433427ade24279e23250afddb0c Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 21:58:43 +0100 Subject: [PATCH 24/37] =?UTF-8?q?Ajout=20de=20la=20journalisation=20pour?= =?UTF-8?q?=20le=20wrapper=20des=20jobs=20cron.=20Enregistrement=20des=20i?= =?UTF-8?q?nformations=20d'ex=C3=A9cution=20et=20nettoyage=20des=20fichier?= =?UTF-8?q?s=20de=20lock=20avec=20gestion=20des=20erreurs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cronservice.py | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/cronservice.py b/cronservice.py index 3d86a54..9199884 100644 --- a/cronservice.py +++ b/cronservice.py @@ -146,6 +146,17 @@ def run_manually(name: Name, job_id: int) -> dict: import sys import os import signal +import logging + +# Configuration du logging +logging.basicConfig( + filename='/tmp/crontab_wrapper_{job_id}.log', + level=logging.DEBUG, + format='%(asctime)s - %(levelname)s - %(message)s' +) +logger = logging.getLogger(__name__) + +logger.info("Wrapper started for job {job_id}") # Ignorer SIGHUP pour survivre à la fermeture de la session parent signal.signal(signal.SIGHUP, signal.SIG_IGN) @@ -153,19 +164,26 @@ def run_manually(name: Name, job_id: int) -> dict: lock_file = "/tmp/crontab_job_{job_id}.lock" try: + command = {repr(command)} + logger.info(f"Executing command: {{command}}") + # Exécuter la commande via shell result = subprocess.run( - {repr(command)}, + command, shell=True, capture_output=False ) + + logger.info(f"Command finished with return code: {{result.returncode}}") sys.exit(result.returncode) finally: # Nettoyer le lock + logger.info("Cleaning up lock file") try: os.remove(lock_file) - except: - pass + logger.info("Lock file removed") + except Exception as e: + logger.error(f"Failed to remove lock: {{e}}") """ # Créer un fichier temporaire pour le script wrapper @@ -192,6 +210,19 @@ def run_manually(name: Name, job_id: int) -> dict: create_lock(job_id, pid) logger.info(f"Lock created for job {job_id} with PID {pid}") + # Attendre 0.5s et vérifier que le process existe toujours + import time + time.sleep(0.5) + + if not psutil.pid_exists(pid): + release_lock(job_id) + logger.error(f"Wrapper process {pid} died immediately - check wrapper script") + return { + "success": False, + "message": "Le wrapper a échoué au démarrage. Vérifiez les logs.", + "pid": None + } + # Ne pas attendre la fin du processus logger.info(f"Job {job_id} ({name}) launched successfully with PID {pid}") From b752ef22b69c01ab13f6535c8d909c767862b002 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 22:02:49 +0100 Subject: [PATCH 25/37] =?UTF-8?q?Am=C3=A9lioration=20de=20la=20journalisat?= =?UTF-8?q?ion=20dans=20la=20fonction=20is=5Fjob=5Frunning.=20Changement?= =?UTF-8?q?=20des=20niveaux=20de=20log=20de=20debug=20=C3=A0=20info=20pour?= =?UTF-8?q?=20une=20meilleure=20visibilit=C3=A9=20des=20=C3=A9tats=20des?= =?UTF-8?q?=20fichiers=20de=20lock=20et=20des=20processus.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cronservice.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cronservice.py b/cronservice.py index 9199884..0a0af4f 100644 --- a/cronservice.py +++ b/cronservice.py @@ -57,40 +57,40 @@ def is_job_running(job_id: int) -> tuple[bool, int | None]: """ lock_file = get_lock_file_path(job_id) - logger.debug(f"Checking lock file: {lock_file}, exists: {lock_file.exists()}") + logger.info(f"Checking lock file: {lock_file}, exists: {lock_file.exists()}") if not lock_file.exists(): - logger.debug(f"No lock file for job {job_id}") + logger.info(f"No lock file for job {job_id}") return False, None try: with open(lock_file, 'r') as f: pid = int(f.read().strip()) - logger.debug(f"Lock file contains PID: {pid}") + logger.info(f"Lock file contains PID: {pid}") # Vérifier si le process existe toujours if psutil.pid_exists(pid): - logger.debug(f"PID {pid} exists in system") + logger.info(f"PID {pid} exists in system") try: process = psutil.Process(pid) status = process.status() - logger.debug(f"Process {pid} status: {status}") + logger.info(f"Process {pid} status: {status}") # Vérifier que le process n'est pas un zombie if status != psutil.STATUS_ZOMBIE: logger.info(f"Job {job_id} is running with PID {pid}") return True, pid else: - logger.debug(f"Process {pid} is zombie, cleaning lock") + logger.info(f"Process {pid} is zombie, cleaning lock") except (psutil.NoSuchProcess, psutil.AccessDenied) as e: - logger.debug(f"Process check failed: {e}") + logger.info(f"Process check failed: {e}") pass else: - logger.debug(f"PID {pid} does not exist") + logger.info(f"PID {pid} does not exist") # Le process n'existe plus, nettoyer le lock lock_file.unlink() - logger.debug(f"Cleaned stale lock file for job {job_id}") + logger.info(f"Cleaned stale lock file for job {job_id}") return False, None except (ValueError, FileNotFoundError): From 7ed04c93f2eda52a7fa05db14a125937ae42693c Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 22:11:04 +0100 Subject: [PATCH 26/37] =?UTF-8?q?Ajout=20de=20la=20possibilit=C3=A9=20de?= =?UTF-8?q?=20lancer=20manuellement=20un=20job=20avec=20la=20commande=20or?= =?UTF-8?q?iginale=20depuis=20la=20base=20de=20donn=C3=A9es.=20Mise=20?= =?UTF-8?q?=C3=A0=20jour=20de=20la=20fonction=20run=5Fmanually=20pour=20ac?= =?UTF-8?q?cepter=20un=20param=C3=A8tre=20db=5Fcommand.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cronservice.py | 14 +++++++++----- main.py | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/cronservice.py b/cronservice.py index 0a0af4f..06c36cb 100644 --- a/cronservice.py +++ b/cronservice.py @@ -114,10 +114,15 @@ def release_lock(job_id: int) -> None: lock_file.unlink() -def run_manually(name: Name, job_id: int) -> dict: +def run_manually(name: Name, job_id: int, db_command: str) -> dict: """ Lance un job manuellement en arrière-plan de manière non-bloquante. + Args: + name: Nom du job + job_id: ID du job + db_command: Commande originale depuis la DB (sans wrapper cron) + Returns: dict: Informations sur le lancement (success, message, pid) """ @@ -132,10 +137,9 @@ def run_manually(name: Name, job_id: int) -> dict: } try: - # Récupérer la commande du job - match = _cron.find_comment(name) - job = list(match)[0] - command = job.command + # Utiliser la commande originale (DB) avec logging, pas celle du crontab (qui a le wrapper) + from utils import add_log_file + command = add_log_file(db_command, name, job_id=None) # Sans wrapper cron logger.info(f"Launching job {job_id} ({name}) in background") logger.debug(f"Command to execute: {command}") diff --git a/main.py b/main.py index 7afb8ec..5eddcdd 100644 --- a/main.py +++ b/main.py @@ -212,7 +212,7 @@ async def run_job(job_id: int, db: Session = Depends(get_db)): raise HTTPException(status_code=404, detail="Job not found") logger.info(f"Running job {job_id}: {chosen_job.name}") - result = cronservice.run_manually(chosen_job.name, job_id) + result = cronservice.run_manually(chosen_job.name, job_id, chosen_job.command) if not result["success"]: logger.warning(f"Job {job_id} execution rejected: {result['message']}") From abb10eda489b578a0d2152cd3db6cf0c3dcc6497 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 23:14:10 +0100 Subject: [PATCH 27/37] =?UTF-8?q?Remplacement=20de=20subprocess.run=20par?= =?UTF-8?q?=20os.system=20pour=20l'ex=C3=A9cution=20des=20commandes=20dans?= =?UTF-8?q?=20le=20wrapper=20des=20jobs=20cron.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cron_wrapper.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cron_wrapper.py b/cron_wrapper.py index 0392d84..768e295 100644 --- a/cron_wrapper.py +++ b/cron_wrapper.py @@ -73,8 +73,10 @@ def main(): # Exécuter la commande exit_code = 0 try: - result = subprocess.run(command, shell=True, executable='/bin/bash') - exit_code = result.returncode + #result = subprocess.run(command, shell=True, executable='/bin/bash') + #exit_code = result.returncode + exit_code = os.system(command) + sys.exit(exit_code >> 8) # os.system() retourne le wait() status log_message(f"Job {job_id} completed with exit code {exit_code}") except Exception as e: log_message(f"Error executing job {job_id}: {e}") From bbca5bf8a640cc772f587f234888732c40bb17ff Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Tue, 2 Dec 2025 23:15:48 +0100 Subject: [PATCH 28/37] =?UTF-8?q?Remplacement=20de=20subprocess.run=20par?= =?UTF-8?q?=20os.system=20pour=20l'ex=C3=A9cution=20des=20commandes=20dans?= =?UTF-8?q?=20la=20fonction=20main,=20am=C3=A9liorant=20la=20gestion=20des?= =?UTF-8?q?=20redirections=20shell=20complexes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cron_wrapper.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cron_wrapper.py b/cron_wrapper.py index 768e295..bc2f0fb 100644 --- a/cron_wrapper.py +++ b/cron_wrapper.py @@ -73,10 +73,10 @@ def main(): # Exécuter la commande exit_code = 0 try: - #result = subprocess.run(command, shell=True, executable='/bin/bash') - #exit_code = result.returncode - exit_code = os.system(command) - sys.exit(exit_code >> 8) # os.system() retourne le wait() status + # os.system() préserve mieux les redirections shell complexes + # Retourne le wait() status (exit_code << 8) + status = os.system(command) + exit_code = status >> 8 if status >= 0 else 1 log_message(f"Job {job_id} completed with exit code {exit_code}") except Exception as e: log_message(f"Error executing job {job_id}: {e}") From 5c6771ae33fe620834ccd1217470684832e77991 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Wed, 3 Dec 2025 05:50:43 +0100 Subject: [PATCH 29/37] Suppression du wrapper cron dans la fonction add_log_file pour simplifier la gestion des logs, en retournant directement la commande avec journalisation. --- cron_wrapper.py | 97 ------------------------------------------------- utils.py | 11 +----- 2 files changed, 2 insertions(+), 106 deletions(-) delete mode 100644 cron_wrapper.py diff --git a/cron_wrapper.py b/cron_wrapper.py deleted file mode 100644 index bc2f0fb..0000000 --- a/cron_wrapper.py +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env python3 -""" -Wrapper pour les jobs cron qui gère le système de lock. -Empêche l'exécution simultanée d'un même job (manuel ou cron). -""" -import sys -import subprocess -import os -import psutil -from pathlib import Path -from datetime import datetime - - -def log_message(message: str): - """Log un message avec timestamp""" - timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S") - print(f"[{timestamp}] {message}") - - -def get_lock_file_path(job_id: str) -> Path: - """Retourne le chemin du fichier lock""" - return Path(f"/tmp/crontab_job_{job_id}.lock") - - -def is_process_running(pid: int) -> bool: - """Vérifie si un processus est vivant (pas zombie)""" - try: - if psutil.pid_exists(pid): - process = psutil.Process(pid) - if process.status() != psutil.STATUS_ZOMBIE: - return True - except (psutil.NoSuchProcess, psutil.AccessDenied): - pass - return False - - -def main(): - if len(sys.argv) < 3: - log_message("Usage: cron_wrapper.py ") - sys.exit(1) - - job_id = sys.argv[1] - command = sys.argv[2] - lock_file = get_lock_file_path(job_id) - - # Vérifier si le job est déjà en cours d'exécution - if lock_file.exists(): - try: - with open(lock_file, 'r') as f: - existing_pid = int(f.read().strip()) - - if is_process_running(existing_pid): - log_message(f"Job {job_id} already running (PID: {existing_pid}), skipping execution") - sys.exit(0) - else: - log_message(f"Found stale lock file (PID: {existing_pid} not running), removing") - lock_file.unlink() - except (ValueError, FileNotFoundError) as e: - log_message(f"Error reading lock file: {e}, removing") - if lock_file.exists(): - lock_file.unlink() - - # Créer le lock avec notre PID - my_pid = os.getpid() - try: - with open(lock_file, 'w') as f: - f.write(str(my_pid)) - log_message(f"Job {job_id} started (PID: {my_pid})") - except Exception as e: - log_message(f"Failed to create lock file: {e}") - sys.exit(1) - - # Exécuter la commande - exit_code = 0 - try: - # os.system() préserve mieux les redirections shell complexes - # Retourne le wait() status (exit_code << 8) - status = os.system(command) - exit_code = status >> 8 if status >= 0 else 1 - log_message(f"Job {job_id} completed with exit code {exit_code}") - except Exception as e: - log_message(f"Error executing job {job_id}: {e}") - exit_code = 1 - finally: - # Supprimer le lock - try: - if lock_file.exists(): - lock_file.unlink() - log_message(f"Lock released for job {job_id}") - except Exception as e: - log_message(f"Failed to remove lock file: {e}") - - sys.exit(exit_code) - - -if __name__ == "__main__": - main() diff --git a/utils.py b/utils.py index 139a95b..982dd8c 100644 --- a/utils.py +++ b/utils.py @@ -8,15 +8,8 @@ def add_log_file(command: Command, name: Name, job_id: int = None) -> str: log_file_name = name.replace(" ", "") - base_command = f"{{ {command} || echo Failed; }} 2>&1 | /usr/bin/ts >> {os.getcwd()}/logs/{log_file_name}.log" - - # Si job_id est fourni, utiliser le wrapper pour gérer le lock - if job_id is not None: - # Wrapper qui gère le lock et empêche les exécutions simultanées - return f'/usr/bin/python3 {os.getcwd()}/cron_wrapper.py {job_id} "{base_command}"' - else: - # Ancien comportement (compatibilité) - return base_command + # Retourner la commande avec logging, sans wrapper cron + return f"{{ {command} || echo Failed; }} 2>&1 | /usr/bin/ts >> {os.getcwd()}/logs/{log_file_name}.log" def delete_log_file(name: Name) -> None: From 610db67b34092f2ed4c63e5feed5488194a524b1 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Wed, 3 Dec 2025 06:05:06 +0100 Subject: [PATCH 30/37] =?UTF-8?q?Ajout=20de=20la=20fonction=20get=5Fcron?= =?UTF-8?q?=5Fdescription=20pour=20g=C3=A9n=C3=A9rer=20des=20descriptions?= =?UTF-8?q?=20lisibles=20des=20expressions=20cron,=20et=20enrichissement?= =?UTF-8?q?=20des=20jobs=20avec=20leur=20description=20localis=C3=A9e=20da?= =?UTF-8?q?ns=20la=20vue=20principale.=20Ajout=20de=20la=20fonction=20get?= =?UTF-8?q?=5Flocale=5Ffrom=5Faccept=5Flanguage=20pour=20extraire=20la=20l?= =?UTF-8?q?ocale=20depuis=20le=20header=20Accept-Language.=20Mise=20=C3=A0?= =?UTF-8?q?=20jour=20des=20d=C3=A9pendances=20dans=20requirements.txt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cronservice.py | 37 +++++++++++++++++++++++++++++++++++++ main.py | 11 ++++++++++- requirements.txt | 1 + templates/home.html | 3 ++- utils.py | 24 ++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 2 deletions(-) diff --git a/cronservice.py b/cronservice.py index 06c36cb..43f9f23 100644 --- a/cronservice.py +++ b/cronservice.py @@ -9,6 +9,7 @@ from pathlib import Path import logging import shlex +from cron_descriptor import get_description from utils import add_log_file, Command, Name, Schedule, delete_log_file @@ -262,6 +263,42 @@ def get_next_schedule(name: Name) -> str: return None +def get_cron_description(schedule: str, locale: str = "en") -> str: + """ + Génère une description lisible d'une expression cron. + + Args: + schedule: Expression cron (ex: "0 2 * * *") + locale: Code locale à 2 lettres (ex: "fr", "en") + + Returns: + str: Description localisée ou expression brute en cas d'erreur + """ + try: + # cron-descriptor utilise des codes locales différents + # Mapper les codes standards vers ceux de cron-descriptor + locale_map = { + 'fr': 'fr_FR', + 'en': 'en_US', + 'es': 'es_ES', + 'de': 'de_DE', + 'it': 'it_IT', + 'pt': 'pt_BR', + 'ru': 'ru_RU', + 'nl': 'nl_NL', + 'pl': 'pl_PL', + 'ja': 'ja_JP', + 'zh': 'zh_CN', + 'ko': 'ko_KR' + } + + cron_locale = locale_map.get(locale, 'en_US') + return get_description(schedule, locale_code=cron_locale) + except Exception as e: + logger.warning(f"Failed to get cron description for '{schedule}': {e}") + return schedule # Fallback sur l'expression brute + + def sync_job_to_cron(comm: Command, name: Name, sched: Schedule, job_id: int) -> None: """Synchronise un job de la DB vers le crontab système""" # Vérifier si le job existe déjà dans le crontab diff --git a/main.py b/main.py index 5eddcdd..dc86022 100644 --- a/main.py +++ b/main.py @@ -9,7 +9,7 @@ import models import cronservice from models import Job -from utils import watch_status, load_logs, clear_logs +from utils import clear_logs, load_logs, get_locale_from_accept_language, watch_status from database import SessionLocal, engine, JobRequest # Configuration du logging @@ -81,6 +81,15 @@ def update_displayed_schedule(db: Session = Depends(get_db)) -> None: async def home(request: Request, db: Session = Depends(get_db)): update_displayed_schedule(db) jobs = db.query(Job).all() + + # Extraire la locale depuis Accept-Language + accept_language = request.headers.get("Accept-Language", "en") + locale = get_locale_from_accept_language(accept_language) + + # Enrichir chaque job avec sa description cron localisée + for job in jobs: + job.cron_description = cronservice.get_cron_description(job.schedule, locale) + output = {"request": request, "jobs": jobs} return templates.TemplateResponse("home.html", output) diff --git a/requirements.txt b/requirements.txt index b82ecae..c931e0b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,7 @@ backports.entry-points-selectable==1.1.0 black==21.9b0 cfgv==3.3.1 click==8.0.3 +cron-descriptor==1.4.5 croniter==1.0.15 distlib==0.3.3 fastapi==0.68.2 diff --git a/templates/home.html b/templates/home.html index 6851a2c..3c42424 100644 --- a/templates/home.html +++ b/templates/home.html @@ -34,7 +34,8 @@
- Cron Expression: {{ job.schedule }}

+ Cron Expression: {{ job.schedule }}
+ Description: {{ job.cron_description }}

Format: minute hour day month weekday
Next execution: {{ job.next_run }}
diff --git a/utils.py b/utils.py index 982dd8c..2aab54f 100644 --- a/utils.py +++ b/utils.py @@ -6,6 +6,30 @@ Schedule = str +def get_locale_from_accept_language(accept_language: str) -> str: + """ + Parse le header Accept-Language et retourne la locale principale. + + Args: + accept_language: Header HTTP Accept-Language (ex: "fr-FR,fr;q=0.9,en;q=0.8") + + Returns: + str: Code locale à 2 lettres (ex: "fr", "en") + """ + if not accept_language: + return "en" + + # Prendre la première langue de la liste + # Format: "fr-FR,fr;q=0.9,en;q=0.8" -> "fr-FR" -> "fr" + try: + primary_lang = accept_language.split(",")[0].split("-")[0].lower() + # Valider que c'est une locale supportée (liste non exhaustive) + supported_locales = ['fr', 'en', 'es', 'de', 'it', 'pt', 'ru', 'nl', 'pl', 'ja', 'zh', 'ko'] + return primary_lang if primary_lang in supported_locales else "en" + except (IndexError, AttributeError): + return "en" + + def add_log_file(command: Command, name: Name, job_id: int = None) -> str: log_file_name = name.replace(" ", "") # Retourner la commande avec logging, sans wrapper cron From 524abc9fee419c4a16fa237c6774414c3d1ada99 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Wed, 3 Dec 2025 06:18:01 +0100 Subject: [PATCH 31/37] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20la=20gestion?= =?UTF-8?q?=20des=20descriptions=20cron=20pour=20utiliser=20cron-descripto?= =?UTF-8?q?r=202.x=20avec=20Options.=20Modification=20des=20chemins=20de?= =?UTF-8?q?=20fichiers=20de=20log=20pour=20pointer=20vers=20/app/logs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cronservice.py | 29 ++++++++++------------------- requirements.txt | 2 +- utils.py | 10 +++++----- 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/cronservice.py b/cronservice.py index 43f9f23..03b1e29 100644 --- a/cronservice.py +++ b/cronservice.py @@ -9,7 +9,7 @@ from pathlib import Path import logging import shlex -from cron_descriptor import get_description +from cron_descriptor import get_description, Options from utils import add_log_file, Command, Name, Schedule, delete_log_file @@ -275,25 +275,16 @@ def get_cron_description(schedule: str, locale: str = "en") -> str: str: Description localisée ou expression brute en cas d'erreur """ try: - # cron-descriptor utilise des codes locales différents - # Mapper les codes standards vers ceux de cron-descriptor - locale_map = { - 'fr': 'fr_FR', - 'en': 'en_US', - 'es': 'es_ES', - 'de': 'de_DE', - 'it': 'it_IT', - 'pt': 'pt_BR', - 'ru': 'ru_RU', - 'nl': 'nl_NL', - 'pl': 'pl_PL', - 'ja': 'ja_JP', - 'zh': 'zh_CN', - 'ko': 'ko_KR' - } + # cron-descriptor 2.x utilise Options() au lieu de locale_code + # La locale est configurée via les Options + options = Options() + options.throw_exception_on_parse_error = False + options.use_24hour_time_format = True - cron_locale = locale_map.get(locale, 'en_US') - return get_description(schedule, locale_code=cron_locale) + # Note: cron-descriptor 2.x ne supporte pas facilement les locales dynamiques + # La locale doit être configurée globalement ou via des options spécifiques + # Pour l'instant, on utilise la locale par défaut (anglais) + return get_description(schedule, options=options) except Exception as e: logger.warning(f"Failed to get cron description for '{schedule}': {e}") return schedule # Fallback sur l'expression brute diff --git a/requirements.txt b/requirements.txt index c931e0b..9b8ccb0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ backports.entry-points-selectable==1.1.0 black==21.9b0 cfgv==3.3.1 click==8.0.3 -cron-descriptor==1.4.5 +cron-descriptor>=2.0.0 croniter==1.0.15 distlib==0.3.3 fastapi==0.68.2 diff --git a/utils.py b/utils.py index 2aab54f..88fc838 100644 --- a/utils.py +++ b/utils.py @@ -33,13 +33,13 @@ def get_locale_from_accept_language(accept_language: str) -> str: def add_log_file(command: Command, name: Name, job_id: int = None) -> str: log_file_name = name.replace(" ", "") # Retourner la commande avec logging, sans wrapper cron - return f"{{ {command} || echo Failed; }} 2>&1 | /usr/bin/ts >> {os.getcwd()}/logs/{log_file_name}.log" + return f"{{ {command} || echo Failed; }} 2>&1 | /usr/bin/ts >> /app/logs/{log_file_name}.log" def delete_log_file(name: Name) -> None: try: log_file_name = name.replace(" ", "") - file = pathlib.Path(f"{os.getcwd()}/logs/{log_file_name}.log") + file = pathlib.Path(f"/app/logs/{log_file_name}.log") file.unlink() except FileNotFoundError: return None @@ -48,20 +48,20 @@ def delete_log_file(name: Name) -> None: def clear_logs(name: Name) -> None: """Vide le contenu du fichier de log sans le supprimer""" log_file_name = name.replace(" ", "") - filename = f"{os.getcwd()}/logs/{log_file_name}.log" + filename = f"/app/logs/{log_file_name}.log" try: with open(filename, 'w') as f: f.write("") except FileNotFoundError: # Créer le fichier s'il n'existe pas - pathlib.Path(f"{os.getcwd()}/logs").mkdir(parents=True, exist_ok=True) + pathlib.Path("/app/logs").mkdir(parents=True, exist_ok=True) with open(filename, 'w') as f: f.write("") def load_logs(name: Name) -> str: log_file_name = name.replace(" ", "") - filename = f"{os.getcwd()}/logs/{log_file_name}.log" + filename = f"/app/logs/{log_file_name}.log" try: with open(filename) as f: return f.read() From f9dae8d068b23a980a2d62fb403fdbf285d0e9d1 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Wed, 3 Dec 2025 07:01:18 +0100 Subject: [PATCH 32/37] =?UTF-8?q?Am=C3=A9lioration=20de=20la=20fonction=20?= =?UTF-8?q?add=5Flog=5Ffile=20pour=20g=C3=A9rer=20l'ex=C3=A9cution=20manue?= =?UTF-8?q?lle=20et=20cron=20avec=20v=C3=A9rification=20de=20lock.=20Suppr?= =?UTF-8?q?ession=20du=20wrapper=20cron=20pour=20simplifier=20la=20gestion?= =?UTF-8?q?=20des=20logs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/utils.py b/utils.py index 88fc838..34e3c52 100644 --- a/utils.py +++ b/utils.py @@ -32,8 +32,15 @@ def get_locale_from_accept_language(accept_language: str) -> str: def add_log_file(command: Command, name: Name, job_id: int = None) -> str: log_file_name = name.replace(" ", "") - # Retourner la commande avec logging, sans wrapper cron - return f"{{ {command} || echo Failed; }} 2>&1 | /usr/bin/ts >> /app/logs/{log_file_name}.log" + log_path = f"/app/logs/{log_file_name}.log" + + if job_id is None: + # Exécution manuelle : pas de vérification de lock (géré par le wrapper Python) + return f"{{ {command} || echo Failed; }} 2>&1 | /usr/bin/ts >> {log_path}" + else: + # Exécution cron : vérification du lock avant d'exécuter + lock_file = f"/tmp/crontab_job_{job_id}.lock" + return f'if [ ! -f {lock_file} ]; then {{ {command} || echo Failed; }} 2>&1 | /usr/bin/ts >> {log_path}; else echo "$(date \'+%Y-%m-%d %H:%M:%S\') Skipped: job already running (manual execution in progress)" >> {log_path}; fi' def delete_log_file(name: Name) -> None: From 270bd32f8a7665f45c6971931271a4688dedb019 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Thu, 4 Dec 2025 18:24:31 +0100 Subject: [PATCH 33/37] =?UTF-8?q?Ajout=20de=20la=20gestion=20de=20l'activa?= =?UTF-8?q?tion/d=C3=A9sactivation=20des=20jobs=20dans=20le=20crontab.=20M?= =?UTF-8?q?ise=20=C3=A0=20jour=20de=20la=20fonction=20sync=5Fjob=5Fto=5Fcr?= =?UTF-8?q?on=20pour=20inclure=20un=20param=C3=A8tre=20is=5Factive.=20Ajou?= =?UTF-8?q?t=20des=20fonctions=20enable=5Fcron=5Fjob=20et=20is=5Fjob=5Fena?= =?UTF-8?q?bled=20pour=20g=C3=A9rer=20l'=C3=A9tat=20des=20jobs.=20Int?= =?UTF-8?q?=C3=A9gration=20d'un=20toggle=20dans=20l'interface=20utilisateu?= =?UTF-8?q?r=20pour=20activer/d=C3=A9sactiver=20les=20jobs,=20avec=20mise?= =?UTF-8?q?=20=C3=A0=20jour=20visuelle=20des=20lignes=20correspondantes.?= =?UTF-8?q?=20Modification=20du=20mod=C3=A8le=20Job=20pour=20que=20is=5Fac?= =?UTF-8?q?tive=20soit=20par=20d=C3=A9faut=20=C3=A0=20True.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cronservice.py | 48 ++++++++++++++++++++++++++++++++++++- main.py | 48 +++++++++++++++++++++++++++++++++++-- models.py | 2 +- static/main.js | 55 +++++++++++++++++++++++++++++++++++++++++++ templates/home.html | 15 +++++++++--- templates/layout.html | 20 ++++++++++++++++ 6 files changed, 181 insertions(+), 7 deletions(-) diff --git a/cronservice.py b/cronservice.py index 03b1e29..9498c9f 100644 --- a/cronservice.py +++ b/cronservice.py @@ -290,7 +290,7 @@ def get_cron_description(schedule: str, locale: str = "en") -> str: return schedule # Fallback sur l'expression brute -def sync_job_to_cron(comm: Command, name: Name, sched: Schedule, job_id: int) -> None: +def sync_job_to_cron(comm: Command, name: Name, sched: Schedule, job_id: int, is_active: bool = True) -> None: """Synchronise un job de la DB vers le crontab système""" # Vérifier si le job existe déjà dans le crontab existing_jobs = list(_cron.find_comment(name)) @@ -300,10 +300,56 @@ def sync_job_to_cron(comm: Command, name: Name, sched: Schedule, job_id: int) -> job = existing_jobs[0] job.setall(sched) job.set_command(add_log_file(comm, name, job_id)) + job.enable(is_active) # Activer ou commenter le job else: # Créer un nouveau job if croniter.is_valid(sched): job = _cron.new(command=add_log_file(comm, name, job_id), comment=name) job.setall(sched) + job.enable(is_active) # Activer ou commenter le job _cron.write() + + +def enable_cron_job(name: Name, enable: bool = True) -> bool: + """ + Active ou désactive un job dans le crontab. + + Args: + name: Nom du job (commentaire dans le crontab) + enable: True pour activer, False pour désactiver (commenter avec #) + + Returns: + bool: True si l'opération a réussi, False sinon + """ + try: + match = _cron.find_comment(name) + job = list(match)[0] + job.enable(enable) + _cron.write() + logger.info(f"Job '{name}' {'enabled' if enable else 'disabled'} successfully") + return True + except IndexError: + logger.error(f"Job '{name}' not found in crontab") + return False + except Exception as e: + logger.error(f"Error enabling/disabling job '{name}': {e}") + return False + + +def is_job_enabled(name: Name) -> bool: + """ + Vérifie si un job est activé dans le crontab. + + Args: + name: Nom du job (commentaire dans le crontab) + + Returns: + bool: True si le job est activé, False s'il est désactivé ou non trouvé + """ + try: + match = _cron.find_comment(name) + job = list(match)[0] + return job.is_enabled() + except IndexError: + return False diff --git a/main.py b/main.py index dc86022..0514a36 100644 --- a/main.py +++ b/main.py @@ -55,8 +55,9 @@ async def startup_event(): for job in jobs: try: - cronservice.sync_job_to_cron(job.command, job.name, job.schedule, job.id) - logger.info(f" ✅ Job '{job.name}' synchronisé") + cronservice.sync_job_to_cron(job.command, job.name, job.schedule, job.id, job.is_active) + status = "✅" if job.is_active else "⏸️ (désactivé)" + logger.info(f" {status} Job '{job.name}' synchronisé") except Exception as e: logger.error(f" ❌ Erreur lors de la synchronisation du job '{job.name}': {e}") @@ -261,3 +262,46 @@ async def delete_job(job_id: int, db: Session = Depends(get_db)): db.delete(job_update) db.commit() return {"INFO": f"Deleted {job_id} Successfully"} + + +@app.post("/toggle_job/{job_id}/") +async def toggle_job(job_id: int, db: Session = Depends(get_db)): + """ + Active ou désactive un job (toggle). + Un job désactivé est commenté dans le crontab avec #. + """ + try: + job = db.query(Job).filter(Job.id == job_id).first() + + if not job: + raise HTTPException(status_code=404, detail="Job not found") + + # Toggle l'état + new_state = not job.is_active + + # Mettre à jour dans le crontab + success = cronservice.enable_cron_job(job.name, new_state) + + if not success: + raise HTTPException(status_code=500, detail="Failed to update crontab") + + # Mettre à jour dans la base de données + job.is_active = new_state + db.commit() + + status_text = "activé" if new_state else "désactivé" + logger.info(f"Job {job_id} ({job.name}) {status_text}") + + return JSONResponse( + content={ + "success": True, + "is_active": new_state, + "message": f"Job {status_text} avec succès" + }, + status_code=200 + ) + except HTTPException: + raise + except Exception as e: + logger.error(f"Error toggling job {job_id}: {str(e)}", exc_info=True) + raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}") diff --git a/models.py b/models.py index 573ad43..340bb8b 100644 --- a/models.py +++ b/models.py @@ -13,4 +13,4 @@ class Job(Base): next_run = Column(String, default=None) status = Column(String, default=None) log = Column(String, default=None) - is_active = Column(Boolean, default=False) + is_active = Column(Boolean, default=True) # True = job actif, False = job commenté (#) diff --git a/static/main.js b/static/main.js index ecab136..919b872 100644 --- a/static/main.js +++ b/static/main.js @@ -1,5 +1,60 @@ // JavaScript vanilla moderne - pas de jQuery nécessaire document.addEventListener("DOMContentLoaded", function () { + // Toggle pour activer/désactiver les jobs + document.querySelectorAll(".job-toggle").forEach((toggle) => { + toggle.addEventListener("change", function () { + const jobId = this.getAttribute("data-job-id"); + const isChecked = this.checked; + const row = this.closest("tr"); + const runButton = row.querySelector(".ui.grey.basic.button"); + + console.log( + `Toggling job ${jobId} to ${isChecked ? "active" : "inactive"}` + ); + + fetch(`/toggle_job/${jobId}/`, { + method: "POST", + headers: { + "Content-Type": "application/json", + Accept: "application/json", + }, + }) + .then((response) => { + if (!response.ok) { + throw new Error(`HTTP ${response.status}: ${response.statusText}`); + } + return response.json(); + }) + .then((data) => { + if (data.success) { + console.log(`Job ${jobId} toggled successfully:`, data); + + // Mettre à jour l'apparence de la ligne + if (data.is_active) { + row.classList.remove("disabled-job"); + if (runButton) runButton.disabled = false; + } else { + row.classList.add("disabled-job"); + if (runButton) runButton.disabled = true; + } + + // Recharger pour mettre à jour le "Next Run" + setTimeout(() => location.reload(), 500); + } else { + alert(`❌ ${data.message || "Erreur inconnue"}`); + // Remettre le toggle à son état précédent + toggle.checked = !isChecked; + } + }) + .catch((error) => { + console.error("Error toggling job:", error); + alert(`❌ Erreur: ${error.message}`); + // Remettre le toggle à son état précédent + toggle.checked = !isChecked; + }); + }); + }); + // Bouton "Add Job" - ouvre le modal const addJobBtn = document.getElementById("add_job"); if (addJobBtn) { diff --git a/templates/home.html b/templates/home.html index 3c42424..e3dcbbe 100644 --- a/templates/home.html +++ b/templates/home.html @@ -8,6 +8,7 @@
Active Command Command Name Schedule
+
+ + +
+
Show Command
@@ -42,13 +50,14 @@
- 
{{ job.next_run }}
+ 
{{ job.is_active and job.next_run or '(désactivé)' }}
 
{{ job.status }}
 - + + From c79e11e1ffe2fe6192278dc89ccdf3ad82fede7e Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Thu, 4 Dec 2025 18:37:28 +0100 Subject: [PATCH 35/37] =?UTF-8?q?Am=C3=A9lioration=20de=20la=20gestion=20d?= =?UTF-8?q?e=20la=20fermeture=20du=20modal=20en=20rendant=20le=20code=20pl?= =?UTF-8?q?us=20lisible.=20Ajout=20de=20sauts=20de=20ligne=20pour=20clarif?= =?UTF-8?q?ier=20la=20condition=20de=20fermeture=20lors=20d'un=20clic=20en?= =?UTF-8?q?=20dehors=20du=20modal.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/main.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/static/main.js b/static/main.js index 2c95b98..8e9c091 100644 --- a/static/main.js +++ b/static/main.js @@ -87,7 +87,11 @@ document.addEventListener("DOMContentLoaded", function () { const modal = document.querySelector(".ui.modal"); if (modal && modal.classList.contains("visible")) { // Si le clic est sur le body.dimmed mais pas sur le modal - if (document.body.classList.contains("dimmed") && !modal.contains(e.target) && e.target !== addJobBtn) { + if ( + document.body.classList.contains("dimmed") && + !modal.contains(e.target) && + e.target !== addJobBtn + ) { closeModal(); } } From bace64456010d073ea073e2d266658ee7890bb98 Mon Sep 17 00:00:00 2001 From: Gilbert Brault Date: Thu, 4 Dec 2025 19:03:54 +0100 Subject: [PATCH 36/37] =?UTF-8?q?Am=C3=A9lioration=20de=20l'interface=20ut?= =?UTF-8?q?ilisateur=20:=20mise=20=C3=A0=20jour=20des=20boutons=20d'action?= =?UTF-8?q?=20avec=20des=20ic=C3=B4nes=20et=20des=20styles=20am=C3=A9lior?= =?UTF-8?q?=C3=A9s.=20Ajout=20de=20tooltips=20et=20ajustement=20des=20marg?= =?UTF-8?q?es=20pour=20une=20meilleure=20exp=C3=A9rience=20utilisateur.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/main.js | 17 ++++++++++------- templates/home.html | 21 +++++++++++++-------- templates/layout.html | 26 ++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 15 deletions(-) diff --git a/static/main.js b/static/main.js index 8e9c091..84a5156 100644 --- a/static/main.js +++ b/static/main.js @@ -104,23 +104,26 @@ document.addEventListener("DOMContentLoaded", function () { } }); - // Boutons "Delete" (rouge) - document.querySelectorAll(".ui.inverted.red.button").forEach((button) => { + // Boutons "Delete" (poubelle) + document.querySelectorAll(".delete-btn").forEach((button) => { button.addEventListener("click", function () { - if (confirm("Are you sure you want delete this job?")) { + if (confirm("Êtes-vous sûr de vouloir supprimer ce job ?")) { const id = this.value; fetch(`job/${id}/`, { method: "DELETE", headers: { "Content-Type": "application/json" }, }) - .then(() => alert("Job Deleted!. Please Reload")) - .catch((error) => alert(`Error: ${error.message}`)); + .then(() => { + alert("✅ Job supprimé !"); + location.reload(); + }) + .catch((error) => alert(`❌ Erreur: ${error.message}`)); } }); }); - // Boutons "Run Now" (gris) - document.querySelectorAll(".ui.grey.basic.button").forEach((button) => { + // Boutons "Run Now" (play) + document.querySelectorAll(".run-btn").forEach((button) => { button.addEventListener("click", function (e) { e.preventDefault(); e.stopPropagation(); diff --git a/templates/home.html b/templates/home.html index c08ea2e..0935317 100644 --- a/templates/home.html +++ b/templates/home.html @@ -55,20 +55,25 @@ 
{{ job.status }}
 - + - - - - - - 
{{ job.is_active and job.next_run or '(désactivé)' }}
+ 
{{ job.is_active and job.next_run or '(disabled)' }}
 
{{ job.status }}
 - -