diff --git a/oarstats.py b/oarstats.py index bb00298a49e2bbcdc1ebb283c4e03bdc67845ce6..32a083247f1c3605f883f12b1532a4e3926fb334 100644 --- a/oarstats.py +++ b/oarstats.py @@ -79,16 +79,16 @@ def main(): for job_id, job_info in stats_yaml.items(): if job_info["owner"] not in owners: owners[job_info["owner"]] = Owner(job_info["owner"]) - elapsed_time = 0 if job_info["startTime"] == 0 else time.time() - job_info["startTime"] - tokens = re.search(walltime_pattern, job_info["message"]).group(1).split(':') - wall_time = int(tokens[0]) * 3600 + int(tokens[1]) * 60 + int(tokens[2]) - resources = int(re.search(resources_pattern, job_info["message"]).group(1)) - queue = re.search(queue_pattern, job_info["message"]).group(1) - karma = float(re.search(karma_pattern, job_info["message"]).group(1)) - devices = job_info["assigned_network_address"] - gpu = re.search(gpu_pattern, job_info["properties"]) is not None - job = Job(job_id, elapsed_time, wall_time, resources, devices, gpu, queue, karma) - owners[job_info["owner"]].add_job(job) + elapsed_time = 0 if job_info["startTime"] == 0 else time.time() - job_info["startTime"] + tokens = re.search(walltime_pattern, job_info["message"]).group(1).split(':') + wall_time = int(tokens[0]) * 3600 + int(tokens[1]) * 60 + int(tokens[2]) + resources = int(re.search(resources_pattern, job_info["message"]).group(1)) + queue = re.search(queue_pattern, job_info["message"]).group(1) + karma = float(re.search(karma_pattern, job_info["message"]).group(1)) + devices = job_info["assigned_network_address"] + gpu = re.search(gpu_pattern, job_info["properties"]) is not None + job = Job(job_id, elapsed_time, wall_time, resources, devices, gpu, queue, karma) + owners[job_info["owner"]].add_job(job) for owner in owners.values(): owner.print_info()