From e7c22b8eccccad5aed7814a3970d98db63ec01c2 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Wed, 2 Sep 2020 09:29:23 +0200
Subject: [PATCH] TrigValTools: sort log file names in LogMergeStep
Sort log file names by modification time before merging them. This is
useful e.g. for athenaHLT child logs in the stop/start tests to make
sure the merged log file is in the proper time order.
---
.../TrigValTools/python/TrigValSteering/CheckSteps.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
index 624f35c396a..4b7b19a736e 100644
--- a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
+++ b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
@@ -169,6 +169,8 @@ class LogMergeStep(Step):
def run(self, dry_run=False):
self.process_extra_regex()
+ # Sort log files by modification time
+ self.log_files.sort(key=lambda f : os.path.getmtime(f) if os.path.isfile(f) else 0)
self.log.info('Running %s merging logs %s into %s',
self.name, self.log_files, self.merged_name)
if dry_run:
--
GitLab