From 18f1004d4aa8c2564b61c77cf1b4f066b1c54db0 Mon Sep 17 00:00:00 2001
From: Robert Rosca <robert.rosca@xfel.eu>
Date: Thu, 19 May 2022 11:44:05 +0200
Subject: [PATCH] Apply 3 suggestion(s) to 1 file(s)
---
webservice/job_monitor.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/webservice/job_monitor.py b/webservice/job_monitor.py
index 069f04063..802d74596 100644
--- a/webservice/job_monitor.py
+++ b/webservice/job_monitor.py
@@ -106,11 +106,11 @@ def update_job_db(config):
c = conn.cursor()
c.execute("SELECT * FROM jobs WHERE status IN ('R', 'PD', 'CG') ")
combined = {}
- log.debug("SLURM info {}".format(statii))
+ log.debug(f"SLURM info {statii}")
for r in c.fetchall():
rid, jobid, proposal, run, status, _time, det, action = r
- log.debug("DB info {}".format(r))
+ log.debug(f"DB info {r}")
cflg, cstatus, *_ = combined.setdefault((rid, action), (
[], [], proposal, run, det
@@ -121,7 +121,7 @@ def update_job_db(config):
c.execute(query, (slstatus, runtime, jobid))
cflg.append('R')
- cstatus.append("{}-{}".format(slstatus, runtime))
+ cstatus.append(f"{slstatus}-{runtime}")
else:
_, sltime, slstatus = slurm_job_status(jobid)
query = "UPDATE jobs SET status=? WHERE jobid LIKE ?"
--
GitLab