diff --git a/webservice/job_monitor.py b/webservice/job_monitor.py index 069f04063c53e4a8a269a8c55e43ce3deaf711e5..802d74596d365fb6f98d3c88efe3a809c1299ac7 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 ?"