From 25780b83bc3252704be2ba450599221eee538445 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas.kluyver@xfel.eu>
Date: Thu, 15 Aug 2024 13:53:01 +0100
Subject: [PATCH 1/2] Store elapsed time in jobs database as a string
---
webservice/webservice.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webservice/webservice.py b/webservice/webservice.py
index f322c1e52..3cc288755 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
)
--
GitLab
From 29f590b0f5a14898e4b7d917756959065f2e73ab Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas.kluyver@xfel.eu>
Date: Thu, 15 Aug 2024 14:08:02 +0100
Subject: [PATCH 2/2] Fix comments in systemd unit files
---
webservice/systemd/cal-job-monitor.service | 3 ++-
webservice/systemd/cal-overview-server.service | 3 ++-
webservice/systemd/cal-webservice.service | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/webservice/systemd/cal-job-monitor.service b/webservice/systemd/cal-job-monitor.service
index 1edc8d756..9a465c189 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 717fafa6b..989f5588c 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 705e4aac6..f2cd6b0b4 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]
--
GitLab