diff --git a/config/01-ce-router-defaults.conf.in b/config/01-ce-router-defaults.conf.in index 37b2ee3bb..f907357ed 100644 --- a/config/01-ce-router-defaults.conf.in +++ b/config/01-ce-router-defaults.conf.in @@ -62,11 +62,11 @@ REMOVE_REASON_3 = strcat("job completed over ", $(COMPLETED_JOB_EXPIRATION), " d # Remove jobs that have exceeded configured or requested max wall time REMOVE_CLAUSE_4 = (JobUniverse == 5 && \ JobStatus == 2 && \ - time() - JobCurrentStartExecutingDate > \ - maxWalltime is undefined ? $(ROUTED_JOB_MAX_TIME)*60 : maxWalltime*60 ) + (time() - JobCurrentStartDate) > \ + (maxWalltime is undefined ? $(ROUTED_JOB_MAX_TIME)*60 : maxWalltime*60) ) REMOVE_REASON_4 = strcat("job exceeded allowed walltime: ", \ maxWalltime is undefined ? $(ROUTED_JOB_MAX_TIME)*60 : maxWalltime*60, \ - "min") + " minutes.") SYSTEM_PERIODIC_REMOVE = $(REMOVE_CLAUSE_1) || \ $(REMOVE_CLAUSE_2) || \