diff --git a/webservice/systemd/cal-job-monitor.service b/webservice/systemd/cal-job-monitor.service index 1edc8d756ba7aeb4bb633d6c715a2a969fbccab6..9a465c1898210b121cffa2eb0e5fec331a624cd8 100644 --- a/webservice/systemd/cal-job-monitor.service +++ b/webservice/systemd/cal-job-monitor.service @@ -6,7 +6,8 @@ PartOf=cal-services.target Type=exec WorkingDirectory=%h/deployments/development/git.xfel.eu/detectors/pycalibration/current/ ExecStart=%h/deployments/development/git.xfel.eu/detectors/pycalibration/current/.venv/bin/python -m webservice.job_monitor --log-level DEBUG -ExecStartPost=/usr/bin/sleep 1 # Pause to make errors in startup more obvious +# Pause to make errors in startup more obvious +ExecStartPost=/usr/bin/sleep 1 Restart=on-failure [Install] diff --git a/webservice/systemd/cal-overview-server.service b/webservice/systemd/cal-overview-server.service index 717fafa6be8e9729eeb12a8f56b358882db2ca43..989f5588ced1e7693f0a522acb21a00cc4f96a62 100644 --- a/webservice/systemd/cal-overview-server.service +++ b/webservice/systemd/cal-overview-server.service @@ -6,7 +6,8 @@ PartOf=cal-services.target Type=exec WorkingDirectory=%h/deployments/development/git.xfel.eu/detectors/pycalibration/current/ ExecStart=%h/deployments/development/git.xfel.eu/detectors/pycalibration/current/.venv/bin/python -m webservice.serve_overview -ExecStartPost=/usr/bin/sleep 1 # Pause to make errors in startup more obvious +# Pause to make errors in startup more obvious +ExecStartPost=/usr/bin/sleep 1 Restart=on-failure [Install] diff --git a/webservice/systemd/cal-webservice.service b/webservice/systemd/cal-webservice.service index 705e4aac67b2cab7a59e0582d28a8be3f1201ec7..f2cd6b0b45adc21771a5ac4f4532093047f6b627 100644 --- a/webservice/systemd/cal-webservice.service +++ b/webservice/systemd/cal-webservice.service @@ -6,7 +6,8 @@ PartOf=cal-services.target Type=exec WorkingDirectory=%h/deployments/development/git.xfel.eu/detectors/pycalibration/current/ ExecStart=%h/deployments/development/git.xfel.eu/detectors/pycalibration/current/.venv/bin/python -m webservice.webservice --mode prod --log-level DEBUG -ExecStartPost=/usr/bin/sleep 1 # Pause to make errors in startup more obvious +# Pause to make errors in startup more obvious +ExecStartPost=/usr/bin/sleep 1 Restart=on-failure [Install] diff --git a/webservice/webservice.py b/webservice/webservice.py index f322c1e5278d687238f7e444e0b11844502721ef..3cc2887557ebdedb15a409ce8f1f196ab19f6380 100644 --- a/webservice/webservice.py +++ b/webservice/webservice.py @@ -486,7 +486,7 @@ async def run_action(job_db, cmd, mode, proposal, run, exec_id) -> str: jobs.append((int(jobid.strip()), exec_id)) with time_db_transaction(job_db, 'Insert jobs'): job_db.executemany( - "INSERT INTO slurm_jobs VALUES (?, ?, 'PENDING', 0, 0)", + "INSERT INTO slurm_jobs VALUES (?, ?, 'PENDING', 0, '0')", jobs )