QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

CE-936 - Add error if cron or repeat-seconds isn't given; add warnings from scheduling.

Browse Source
This commit is contained in:
darin.kelkhoff
2024-03-19 11:33:12 -05:00
parent c8c7051628
commit 5963a706b0
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/scheduledjobs/customizers/ScheduledJobTableCustomizer.java
View File

@ -43,6 +43,7 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateInput;
import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.data.QRecord;
import com.kingsrook.qqq.backend.core.model.scheduledjobs.ScheduledJob; import com.kingsrook.qqq.backend.core.model.scheduledjobs.ScheduledJob;
import com.kingsrook.qqq.backend.core.model.statusmessages.BadInputStatusMessage; import com.kingsrook.qqq.backend.core.model.statusmessages.BadInputStatusMessage;
import com.kingsrook.qqq.backend.core.model.statusmessages.QWarningMessage;
import com.kingsrook.qqq.backend.core.scheduler.QScheduleManager; import com.kingsrook.qqq.backend.core.scheduler.QScheduleManager;
import com.kingsrook.qqq.backend.core.utils.CollectionUtils; import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.StringUtils;
@ -126,6 +127,13 @@ public class ScheduledJobTableCustomizer implements TableCustomizerInterface
record.addError(new BadInputStatusMessage("If a Cron Expression is given, then a Cron Time Zone Id is required.")); record.addError(new BadInputStatusMessage("If a Cron Expression is given, then a Cron Time Zone Id is required."));
} }
} }
else
{
if(!StringUtils.hasContent(record.getValueString("repeatSeconds")))
{
record.addError(new BadInputStatusMessage("Either Cron Expression or Repeat Seconds must be given."));
}
}
} }
} }
@ -189,7 +197,8 @@ public class ScheduledJobTableCustomizer implements TableCustomizerInterface
try try
{ {
List<QRecord> freshRecordListWithAssociations = freshlyQueryForRecordsWithAssociations(recordsWithoutErrors); Map<Integer, QRecord> originalRecordMap = recordsWithoutErrors.stream().collect(Collectors.toMap(r -> r.getValueInteger("id"), r -> r));
List<QRecord> freshRecordListWithAssociations = freshlyQueryForRecordsWithAssociations(recordsWithoutErrors);
QScheduleManager scheduleManager = QScheduleManager.getInstance(); QScheduleManager scheduleManager = QScheduleManager.getInstance();
for(QRecord record : freshRecordListWithAssociations) for(QRecord record : freshRecordListWithAssociations)
@ -200,7 +209,11 @@ public class ScheduledJobTableCustomizer implements TableCustomizerInterface
} }
catch(Exception e) catch(Exception e)
{ {
LOG.info("Caught exception while scheduling a job in post-action", e, logPair("id", record.getValue("id"))); LOG.warn("Caught exception while scheduling a job in post-action", e, logPair("id", record.getValue("id")));
if(originalRecordMap.containsKey(record.getValueInteger("id")))
{
originalRecordMap.get(record.getValueInteger("id")).addWarning(new QWarningMessage("Error scheduling job: " + e.getMessage()));
}
} }
} }
} }
@ -265,7 +278,7 @@ public class ScheduledJobTableCustomizer implements TableCustomizerInterface
} }
catch(Exception e) catch(Exception e)
{ {
LOG.info("Caught exception while scheduling a job in post-action", e, logPair("id", record.getValue("id"))); LOG.warn("Caught exception while un-scheduling a job in post-action", e, logPair("id", record.getValue("id")));
} }
} }
} }